workContent必填控制

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import java.util.List;
  * </p>
  *
  * @author Seyason
- * @since 2022-06-09
+ * @since 2022-06-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -110,9 +110,8 @@ public class TimeType extends Model<TimeType> {
     @TableField("custom_degree_name")
     private String customDegreeName;
 
-
     /**
-     * 工时填报自定义维度是否必填
+     * 工时填报自定义维度是否必填 0-否 1-是
      */
     @TableField("custom_degree_status")
     private Integer customDegreeStatus;
@@ -153,9 +152,8 @@ public class TimeType extends Model<TimeType> {
     @TableField("custom_data_name")
     private String customDataName;
 
-
     /**
-     * 工时填报数值收集字段是否必填
+     * 工时填报数值收集字段是否必填 0-否 1-是
      */
     @TableField("custom_data_status")
     private Integer customDataStatus;
@@ -250,8 +248,15 @@ public class TimeType extends Model<TimeType> {
     @TableField("alert_type")
     private Integer alertType;
 
+    /**
+     * 0-工作内容非必填 1-工作内容必填
+     */
+    @TableField("work_content_state")
+    private Integer workContentState;
+
     @TableField(exist = false)
     private List<User> userList;
+
     @Override
     protected Serializable pkVal() {
         return this.companyId;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/CompanyDingdingServiceImpl.java

@@ -380,7 +380,7 @@ public class CompanyDingdingServiceImpl extends ServiceImpl<CompanyDingdingMappe
         msg.getOa().getBody().setContent(content);
         msg.getOa().getBody().setForm(form);
         msg.setMsgtype("oa");
-        if(form.get(0).getKey().equals("里程碑")){
+        if(form.get(0).getKey().equals("里程碑:")){
             msg.getOa().setMessageUrl("dingtalk://dingtalkclient/action/openapp?corpid="+dingding.getCorpid()
                     +"&container_type=work_platform&app_id=0_"+dingding.getAgentId()+"&redirect_type=jump&redirect_url="+ URLEncoder.encode(dingding.getWebUrl()+"?corpid="+dingding.getCorpid())+"&jumpto=/info/"+projectId);
         }else {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1258,8 +1258,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             List<Department> deptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
             for (User item : data) {
                 if (item.getDepartmentId() != 0) {
-                    Department department = deptList.stream().filter(d->d.getDepartmentId().equals(item.getDepartmentId())).findFirst().get();
-                    item.setDepartmentName(department.getDepartmentName());
+                    Optional<Department> first = deptList.stream().filter(d -> d.getDepartmentId().equals(item.getDepartmentId())).findFirst();
+                    if(first.isPresent()){
+                        Department department =first.get();
+                        item.setDepartmentName(department.getDepartmentName());
+                    }
                 }
                 HSSFRow row = sheet.createRow(rowNum);
                 row.createCell(0).setCellValue(rowNum);