代码提交

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

@@ -102,7 +102,7 @@ public class ProblemInitiationServiceImpl {
         }
         qualityProblem.setInstanceId(instanceId);
         try {
-            qualityProblem.setStatus(projectInitiationService.getFlowTaskName(null,false,null,null,null,null,null,null,instanceId));
+            qualityProblem.setStatus(projectInitiationService.getFlowTaskName(null,null,false,null,null,null,null,null,null,instanceId));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -441,7 +441,7 @@ public class ProblemInitiationServiceImpl {
         wrapper.eq(QualityProblem::getInstanceId,instanceId);
         QualityProblem qualityProblem = qualityProblemService.getOne(wrapper);
         try {
-            qualityProblem.setStatus(projectInitiationService.getFlowTaskName(null,false,null,null,null,null,null,null,instanceId));
+            qualityProblem.setStatus(projectInitiationService.getFlowTaskName(null,null,false,null,null,null,null,null,null,instanceId));
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -62,7 +62,7 @@ public class ProcessRelationServiceImpl extends BaseService<ProcessRelationDto,
         ProcessRelation processRelation = this.getOne(wrapper);
         try {
             if(ValidationUtil.isEmpty(taskName)) {
-                taskName = projectInitiationService.getFlowTaskName(null,false,null,null,null,null,null,null,instanceId);
+                taskName = projectInitiationService.getFlowTaskName(null,null,false,null,null,null,null,null,null,instanceId);
             }
             processRelation.setStatus(taskName);
             this.updateById(processRelation);

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

@@ -205,7 +205,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         }
         String taskName = null;
         try {
-            taskName = getFlowTaskName(null,false,null,null,null,null,null,null,instanceId);
+            taskName = getFlowTaskName(null,null,false,null,null,null,null,null,null,instanceId);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -315,7 +315,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 taskService.saveOrUpdateTask(taskName, true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
 
                 //更新project种的status字段,更新关系表中的state字段，表示当前流程下一个执行的任务
-                boolean bool = updateFlowStatus(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
+                boolean bool = updateFlowStatus( taskName,project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
 
                 //如果更新了status状态 新增任务表的状态 待办
                 if(bool) {
@@ -569,7 +569,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
      * @param instanceId
      * @return
      */
-    public String getFlowTaskName(Project project, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
+    public String getFlowTaskName(String firstName, Project project, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
         JSONObject dataObject = new JSONObject();
         boolean isEnd = false;
         try {
@@ -599,6 +599,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                         taskService.saveOrUpdateTask(ProjectInitiationEnum.设计负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
                     }
                 }
+
                 if(ProjectInitiationEnum.监检员审核.getName().equals(name)){
                     isEnd = true;
                 }
@@ -607,6 +608,33 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 return ProjectInitiationEnum.监检员审核.getName();
             }
         }
+        if(null != firstName) {
+            if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(firstName)){
+                return ProjectInitiationEnum.安装负责人指定项目资料员.getName();
+            }
+            if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(firstName)){
+                return  ProjectInitiationEnum.安装开工资料提交.getName();
+            }
+            if(ProjectInitiationEnum.安装开工资料提交.getName().equals(firstName)){
+                return ProjectInitiationEnum.安装资料审核.getName();
+            }
+            if(ProjectInitiationEnum.安装资料审核.getName().equals(firstName)){
+                return ProjectInitiationEnum.安装资料审批.getName();
+            }
+            if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(firstName)){
+                return ProjectInitiationEnum.设计负责人指定项目资料员.getName();
+            }
+            if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(firstName)){
+                return ProjectInitiationEnum.设计开工资料提交.getName();
+            }
+            if(ProjectInitiationEnum.设计开工资料提交.getName().equals(firstName)){
+                return ProjectInitiationEnum.设计资料审核.getName();
+            }
+            if(ProjectInitiationEnum.设计资料审核.getName().equals(firstName)){
+                return ProjectInitiationEnum.设计资料审批.getName();
+            }
+        }
+
         String taskName = "流程结束！";
         try {
             taskName=dataObject.getString("name");
@@ -620,7 +648,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
     OrgServiceImpl orgService;
 
     @BusinessIdentify
-    public boolean updateFlowStatus(String InitiationStatus, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
+    public boolean updateFlowStatus(String firstTaskName, String InitiationStatus, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Project::getInstanceId,instanceId);
         Project project = projectService.getOne(wrapper);
@@ -630,7 +658,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             project.setChargePersonId(orgService.getReginParams().getBusinessInfo().getUserSequenceNbr());
         }
 
-        String taskName = getFlowTaskName(project, status, taskType, sendTime, sourceId, type, unitIds,extendId, instanceId);
+        String taskName = getFlowTaskName(firstTaskName,project, status, taskType, sendTime, sourceId, type, unitIds,extendId, instanceId);
         boolean bool = true;
         if (( project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){
             bool = false;