修改任务文件相关接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -123,6 +123,8 @@ public class TaskController {
 
     @Resource
     private DepartmentMapper departmentMapper;
+    @Autowired
+    private TaskFilesMapper taskFilesMapper;
 
     @PostMapping("/getTaskChargePage")
     public HttpRespMsg getTaskChargePage(
@@ -1363,6 +1365,7 @@ public class TaskController {
         List<Integer> collect = list.stream().map(l -> l.getId()).distinct().collect(Collectors.toList());
         collect.add(-1);
         List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().in("task_id", collect));
+        List<TaskFiles> taskFilesList = taskFilesMapper.selectList(new LambdaQueryWrapper<TaskFiles>().in(TaskFiles::getTaskId, collect));
         List<Integer> pids = list.stream().map(Task::getProjectId).collect(Collectors.toList());
         pids.add(-1);
         List<Project> projectList = projectService.list(new QueryWrapper<Project>().in("id", pids));
@@ -1385,7 +1388,15 @@ public class TaskController {
                 );
                 userIdNameMap = users.stream().collect(Collectors.toMap(User::getId, User::getName));
             }
+            Map<Integer, List<TaskFiles>> taskFilesMap = new HashMap<>();
+            if(CollectionUtils.isNotEmpty(taskFilesList)){
+                taskFilesMap  = taskFilesList.stream().collect(Collectors.groupingBy(TaskFiles::getTaskId));
+            }
             for (Task task : list) {
+                List<TaskFiles> tmp = taskFilesMap.get(task.getId());
+                if(CollectionUtils.isEmpty(tmp)){
+                    continue;
+                }
                 if(org.apache.commons.lang3.StringUtils.isBlank(task.getChargeOneId()) || org.apache.commons.lang3.StringUtils.isBlank(task.getChargeTwoId())){
                     continue;
                 }

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

@@ -243,7 +243,7 @@ public class Task extends Model<Task> {
     @TableField("sap_task_code")
     private String sapTaskCode;
 
-    /**文件审核人一id*/
+    /**文件审核人一[部门负责人]id*/
     @TableField("charge_one_id")
     private String chargeOneId;
 
@@ -262,7 +262,7 @@ public class Task extends Model<Task> {
 //    @TableField("charge_one_reason")
 //    private String chargeOneReason;
 
-    /**文件审核人二id*/
+    /**文件审核人二[项目审核人]id*/
     @TableField("charge_two_id")
     private String chargeTwoId;
 

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

@@ -11,7 +11,7 @@ public class TaskChargePageVO {
     private String taskName;
     private Integer projectId;
     private String projectName;
-    private String creatorId;
+    private String createrId;
     private Integer chargeStage;
     private String chargeOneId;
     private Integer chargeOneStatus;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -413,7 +413,7 @@
         select tmp1.*,user.name as finalChargeName
         from
             (
-                select tf.task_id,tf.creator_id,task.name as taskName,task.charge_stage
+                select tf.task_id,task.creater_id,task.name as taskName,task.charge_stage
                      ,task.charge_one_id,task.charge_one_status,task.executor_id,task.group_id
                      ,task.charge_two_id,task.charge_two_status,p.id as projectId,p.project_name,
                     case task.charge_stage
@@ -451,7 +451,7 @@
         select tmp1.*,user.name as finalChargeName
         from
             (
-                select tf.task_id,tf.creator_id,task.name as taskName,task.charge_stage
+                select tf.task_id,task.creater_id,task.name as taskName,task.charge_stage
                      ,task.charge_one_id,task.charge_one_status,task.executor_id,task.group_id
                      ,task.charge_two_id,task.charge_two_status,project.id as projectId,project.project_name,
                     case task.charge_stage
@@ -462,7 +462,7 @@
                     task_files tf
                         left join task on tf.task_id = task.id
                         left join project on task.project_id = project.id
-                        left join user on tf.creator_id = user.id
+                        left join user on task.creater_id = user.id
                         left join department d on user.department_id = d.department_id
                 <where>
                     task.task_status = 0 and task.final_charge_status = 0
@@ -498,7 +498,7 @@
         select tmp1.*,user.name as finalChargeName
         from
         (
-        select tf.task_id,tf.creator_id,task.name,task.charge_stage
+        select tf.task_id,task.creater_id,task.name,task.charge_stage
         ,task.charge_one_id,task.charge_one_status,task.executor_id
         ,task.charge_two_id,task.charge_two_status,p.id,p.project_name,
         case task.charge_stage
@@ -536,7 +536,7 @@
         select tmp1.*,user.name as finalChargeName
         from
         (
-        select tf.task_id,tf.creator_id,task.name,task.charge_stage
+        select tf.task_id,task.creater_id,task.name,task.charge_stage
         ,task.charge_one_id,task.charge_one_status,task.executor_id
         ,task.charge_two_id,task.charge_two_status,project.id,project.project_name,
         case task.charge_stage
@@ -547,7 +547,7 @@
         task_files tf
         left join task on tf.task_id = task.id
         left join project on task.project_id = project.id
-        left join user on tf.creator_id = user.id
+        left join user on task.creater_id = user.id
         left join department d on user.department_id = d.department_id
         <where>
             task.task_status = 0 and task.final_charge_status = 0