代码提交

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

@@ -250,6 +250,32 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                     break;
                 }
 
+                if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(name) || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(name) ){
+                    dataObject = JSON.parseObject(JSON.toJSONString(o));
+                    isEnd = false;
+                    break;
+                }
+
+                if(ProjectInitiationEnum.安装资料审核.getName().equals(name) || ProjectInitiationEnum.设计资料审核.getName().equals(name) ){
+                    dataObject = JSON.parseObject(JSON.toJSONString(o));
+                    isEnd = false;
+                    break;
+                }
+
+                if(ProjectInitiationEnum.安装资料审批.getName().equals(name) || ProjectInitiationEnum.设计资料审批.getName().equals(name) ){
+                    dataObject = JSON.parseObject(JSON.toJSONString(o));
+                    isEnd = false;
+                    break;
+                }
+
+
+                if(ProjectInitiationEnum.安装开工资料提交.getName().equals(name) || ProjectInitiationEnum.设计开工资料提交.getName().equals(name) ){
+                    dataObject = JSON.parseObject(JSON.toJSONString(o));
+                    isEnd = false;
+                    break;
+                }
+
+
                 if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name) || ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)) {
                     dataObject = JSON.parseObject(JSON.toJSONString(o));
                     isEnd = false;
@@ -344,26 +370,19 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
 //                        }
                         if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.安装负责人指定项目资料员.getName();
-                        }
-                        if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.安装开工资料提交.getName();
-                        }
-                        if(ProjectInitiationEnum.安装开工资料提交.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.安装开工资料提交.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.安装资料审核.getName();
-                        }
-                        if(ProjectInitiationEnum.安装资料审核.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.安装资料审核.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.安装资料审批.getName();
-                        }
-                        if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.设计负责人指定项目资料员.getName();
-                        }
-                        if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.设计开工资料提交.getName();
-                        }
-                        if(ProjectInitiationEnum.设计开工资料提交.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.设计开工资料提交.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.设计资料审核.getName();
-                        }
-                        if(ProjectInitiationEnum.设计资料审核.getName().equals(taskName)){
+                        } else if(ProjectInitiationEnum.设计资料审核.getName().equals(taskName)){
                             taskName = ProjectInitiationEnum.设计资料审批.getName();
                         }
                         taskService.saveOrUpdateTask(taskName, false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);