添加人工流程代办任务处理

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/ManualProcessingEnum.java

@@ -7,15 +7,16 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ManualProcessingEnum {
-    问题自动录入("", "问题自动录入","整改书待提交"),
-    问题录入("", "问题录入","整改书待提交"),
-    提交整改书("1", "提交整改书","整改待审批"),
-    整改审批("2", "整改审批", "整改书待提交"),
-    流程结束("3", "流程结束","");
+    问题自动录入("", "问题自动录入","整改书待提交",""),
+    问题录入("", "问题录入","整改书待提交", ""),
+    提交整改书("1", "提交整改书","整改待审批", ", 待提交"),
+    整改审批("2", "整改审批", "整改书待提交", ", 待审批"),
+    流程结束("3", "流程结束","", "");
 
     private final String status;
     private final String name;
     private final String detail;
+    private final String taskAgent;
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.*;
+import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProcessRelationMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProcessRelationService;
@@ -539,10 +540,61 @@ public class ProblemInitiationServiceImpl {
             projectInitiation.setType(ProcessTypeEnum.人工处理.getType());
             projectInitiationService.save(projectInitiation);
             // 更新关联表数据
-            iProcessRelationService.updateState(qualityProblem.getInstanceId(),null);
+            iProcessRelationService.updateState(qualityProblem.getInstanceId(), null);
+            // 新增、更新代办任务
+            taskSaveOrUpdate(qualityProblem);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return "ok";
     }
+
+    public void taskSaveOrUpdate(QualityProblem qualityProblem) {
+        //更新上一步任务  已办
+        LambdaQueryWrapper<Task> lambda = new QueryWrapper<Task>().lambda();
+        lambda.eq(Task::getSourceId, qualityProblem.getSequenceNbr());
+        lambda.eq(Task::getStatus, 0);
+        lambda.eq(Task::getType, ProcessTypeEnum.人工处理.getType());
+        List<Task> tasks = taskService.getBaseMapper().selectList(lambda);
+        if (!ObjectUtils.isEmpty(tasks)) {
+            Task task = tasks.get(0);
+            task.setStatus(1);
+            task.setStatusLabel(TaskTypeEnum.已办.getName());
+            if (ManualProcessingEnum.提交整改书.getName().equals(task.getTitle())) {
+                task.setContent(ManualProcessingEnum.提交整改书.getName() + ", 已完成");
+            } else if (ManualProcessingEnum.整改审批.getName().equals(task.getTitle())) {
+                task.setContent(ManualProcessingEnum.整改审批.getName() + ", 已完成");
+            }
+            taskService.updateById(task);
+        }
+        //新增下一步任务 代办
+        ProjectDto detail = projectServiceImpl.selectById(qualityProblem.getProjectId());
+        // 建设单位id
+        Long constructionUnitId = detail.getConstructionUnitId();
+        Long testingUnitId = detail.getTestingUnitId();
+        Task task = new Task();
+        task.setType(ProcessTypeEnum.人工处理.getType());
+        task.setSourceId(qualityProblem.getSequenceNbr());
+        task.setStatus(0);
+        task.setSendTime(new Date());
+        if (ManualProcessingEnum.问题录入.getDetail().equals(qualityProblem.getStatus())) {
+            // 如果当前状态为整改书待提交时
+            task.setTitle(ManualProcessingEnum.提交整改书.getName());
+            task.setUnitId(constructionUnitId);
+            task.setTaskType(TaskTypeEnum.填报.getKey());
+            task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
+            task.setStatusLabel(TaskTypeEnum.待办.getName());
+            task.setContent(ManualProcessingEnum.提交整改书.getName() + ManualProcessingEnum.提交整改书.getTaskAgent());
+            taskService.save(task);
+        } else if (ManualProcessingEnum.提交整改书.getDetail().equals(qualityProblem.getStatus())) {
+            // 如果当前状态为整改待审批时
+            task.setTitle(ManualProcessingEnum.整改审批.getName());
+            task.setUnitId(testingUnitId);
+            task.setTaskType(TaskTypeEnum.流程.getKey());
+            task.setTaskTypeLabel(TaskTypeEnum.流程.getName());
+            task.setStatusLabel(TaskTypeEnum.待办.getName());
+            task.setContent(ManualProcessingEnum.整改审批.getName() + ManualProcessingEnum.整改审批.getTaskAgent());
+            taskService.save(task);
+        }
+    }
 }