日报填写拍照照片选择控制

待审核企业微信消息推送
项目 部门相关修改
Bug修复(待审核统计)

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

@@ -300,6 +300,12 @@ public class Project extends Model<Project> {
     @TableField("dept_id")
     private Integer deptId;
 
+    /**
+     * 部门层级
+     */
+    @TableField("dept_cascade")
+    private String deptCascade;
+
     @TableField(exist = false)
     ProjectSeparate projectSeparate;
 

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

@@ -448,6 +448,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             .setTaskGpIncharge(taskGpIncharge)
                             .setProviderIds(providerIds)
                             .setDeptId(deptId)
+                            .setDeptCascade(deptId == null ?
+                                    convertDepartmentIdToCascade(0) :
+                                    convertDepartmentIdToCascade(deptId))
                             .setProviderNames(providerNames);
                     if(timeType.getOutputValueStatus()==1){
                         project.setOutputValue(outputValue==null?0.00:outputValue);
@@ -531,6 +534,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         .setTaskGpIncharge(taskGpIncharge)
                         .setProviderIds(providerIds)
                         .setDeptId(deptId)
+                        .setDeptCascade(deptId == null ?
+                                convertDepartmentIdToCascade(0) :
+                                convertDepartmentIdToCascade(deptId))
                         .setProviderNames(providerNames);
                 if(timeType.getOutputValueStatus()==1){
                     p.setOutputValue(outputValue==null?0.00:outputValue);
@@ -752,6 +758,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
+    //将部门id转换为部门层级
+    private String convertDepartmentIdToCascade(Integer id) {
+        StringBuilder cascade = new StringBuilder();
+        if (id == 0) {
+            cascade.append("0");
+        } else {
+            cascade.append(id);
+            id = departmentMapper.selectById(id).getSuperiorId();
+            while (id != null) {
+                cascade.append(",").append(id);
+                id = departmentMapper.selectById(id).getSuperiorId();
+            }
+        }
+        return cascade.toString();
+    }
+
     //更新项目的基线成本数据
     private List<ProjectBasecost> updateProjectBaseCostData(String data, Integer projectId) {
         JSONArray array = JSONArray.parseArray(data);