竣工结项流程补充，待办已办补充

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

@@ -9,20 +9,23 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum OverProjectFlowEnum {
-    竣工资料上传确认("1", "竣工资料上传确认", "ZLSCQR", ""),
-    上传竣工资料("2", "上传竣工资料", "SCJGZL", "竣工资料待上传"),
-    竣工资料审核("3", "竣工资料审核", "JGZLSH", "竣工资料待审核"),
-    填写审核意见("4", "填写审核意见", "TXSHYJ", "审核意见待填写");
+    竣工资料上传确认("1", "竣工资料上传确认", "ZLSCQR", "竣工资料上传待确认", "审核确认", "待确认"),
+    上传竣工资料("2", "上传竣工资料", "SCJGZL", "竣工资料待上传", "竣工资料上传", "待上传"),
+    竣工资料审核并填写审核意见("3", "竣工资料审核并填写审核意见", "JGZLSH", "竣工资料待审核", "竣工资料审核", "待审核");
 
     private final String status;
     private final String name;
     private final String code;
     private final String taskDetailStatus;
+    private String taskName;
+    private String taskStatus;
 
     public static Map<String, String> getNameByStatusMap = new HashMap<String, String>();
     public static Map<String, String> getStatusByNameMap = new HashMap<String, String>();
     public static Map<String, String> getCodeByNameMap = new HashMap<String, String>();
     public static Map<String, String> getTaskDetailStatusMap = new HashMap<String, String>();
+    public static Map<String,String> getTaskStatusMap = new HashMap<String, String>();
+    public static Map<String,String> getTaskNameMap = new HashMap<String, String>();
 
     static {
         for (OverProjectFlowEnum projectInitiationEnum : OverProjectFlowEnum.values()) {
@@ -30,6 +33,8 @@ public enum OverProjectFlowEnum {
             getStatusByNameMap.put(projectInitiationEnum.name, projectInitiationEnum.status);
             getCodeByNameMap.put(projectInitiationEnum.name, projectInitiationEnum.code);
             getTaskDetailStatusMap.put(projectInitiationEnum.name, projectInitiationEnum.taskDetailStatus);
+            getTaskStatusMap.put(projectInitiationEnum.name,projectInitiationEnum.taskStatus);
+            getTaskNameMap.put(projectInitiationEnum.name,projectInitiationEnum.taskName);
         }
     }
 

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

@@ -12,7 +12,8 @@ public enum TaskTypeEnum {
     待办("false","待办"),
     已办("true","已办"),
     项目立项("project","项目立项"),
-    质量问题("problem","质量问题");
+    质量问题("problem","质量问题"),
+    项目结项("overProject","项目结项");
 
     String key;
     String name;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/OverProjectDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 @Data
@@ -18,7 +20,7 @@ public class OverProjectDto {
     /**
      * 竣工资料
      */
-    private String completeFile;
+    private Object completeFile;
 
     /**
      * 审核意见

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

@@ -320,6 +320,14 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             unitIds.add(project.getDesignUnitId());
             taskType = TaskTypeEnum.填报.getKey();
         }
+        if (OverProjectFlowEnum.上传竣工资料.getName().equals(project.getStatus())) {
+            unitIds.add(project.getConstructionUnitId());
+            taskType = TaskTypeEnum.填报.getKey();
+        }
+        if (OverProjectFlowEnum.竣工资料审核并填写审核意见.getName().equals(project.getStatus()) || OverProjectFlowEnum.竣工资料上传确认.getName().equals(project.getStatus())) {
+            unitIds.add(superviseRule.getSuperviseDeptId());
+            taskType = TaskTypeEnum.流程.getKey();
+        }
         return taskType;
     }
 
@@ -499,6 +507,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
 
     @Override
     public void overProjectFlowExecute(OverProjectDto overProjectDto) {
+        String taskType = "";
+        List<Long> unitIds = new ArrayList<>();
+        Long extendId = -1L;
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(overProjectDto.getInstanceId());
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -532,8 +543,23 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 //执行流程
                 Workflow.taskClient.completeByTask(taskId, dto);
                 processRelationService.updateState(overProjectDto.getInstanceId(),null);
+                //项目的管辖区域
+                Project project = projectService.getById(overProjectDto.getProjectId());
+                String regionCode = project.getInstallRegionCode();
+                LambdaQueryWrapper<SuperviseRule> wrapperSR = new LambdaQueryWrapper<>();
+                wrapperSR.eq(SuperviseRule :: getAdminRegionCode,regionCode);
+                SuperviseRule superviseRule = superviseRuleService.getOne(wrapperSR);
+                //更新任务表的状态 已办
+                taskType = getUnitId(unitIds, project, superviseRule);
+                taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目结项.getKey(), unitIds,null);
+
                 //更新project种的status字段，表示当前流程下一个执行的任务
-                updateProjectFlowStatus(overProjectDto.getInstanceId());
+                Project projectNext = updateProjectFlowStatusReturnObject(overProjectDto.getInstanceId());
+
+                //新增任务表的状态 待办
+                unitIds = new ArrayList<>();
+                taskType = getUnitId(unitIds, projectNext, superviseRule);
+                taskService.saveOrUpdateTask(projectNext.getStatus(), false, taskType, new Date(), projectNext.getSequenceNbr(), TaskTypeEnum.项目结项.getKey(), unitIds,extendId);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -541,4 +567,19 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         }
     }
 
+
+    /**
+     * //更新project种的status字段，表示当前流程下一个执行的任务
+     * @param instanceId 实例ID
+     * @return 修改后的项目信息
+     */
+    public Project updateProjectFlowStatusReturnObject(String instanceId){
+        LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Project::getInstanceId,instanceId);
+        Project project = projectService.getOne(wrapper);
+        project.setStatus(getFlowTaskName(instanceId));
+        projectService.updateById(project);
+        return project;
+    }
+
 }

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

@@ -65,6 +65,11 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                         //不是项目立项流程，是问题处置流程
                         title = ProblemProcessEnum.getTaskNameMap.get(InitiationStatus);
                         taskStatus = ProblemProcessEnum.getTaskStatusMap.get(InitiationStatus);
+                        if (ValidationUtil.isEmpty(title)) {
+                            //不是以上流程、是项目结项流程
+                            title = OverProjectFlowEnum.getTaskNameMap.get(InitiationStatus);
+                            taskStatus = OverProjectFlowEnum.getTaskStatusMap.get(InitiationStatus);
+                        }
                     }
                 }