代码提交

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

@@ -326,18 +326,45 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                     unitIds = new ArrayList<>();
                     taskType = getUnitId(unitIds, project, superviseRule);
 
-                    if(project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName())
+                    if(project.getStatus().contains("/") && ( project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName())
                             || project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目资料员.getName())
                             || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目负责人.getName())
-                            || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName())
+                            || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName()) )
                     ) {
                         unitIds = unitIds.stream().distinct().collect(Collectors.toList());
-                        AjaxResult ajaxResultR = Workflow.taskClient.getTaskNoAuth(instanceId);
-                        dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
-                        try {
-                            taskName=dataObject.getString("name");
-                        }catch (Exception e) {
-                            log.error("当前流程名称为空");
+//                        AjaxResult ajaxResultR = Workflow.taskClient.getTaskNoAuth(instanceId);
+//                        dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
+//                        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
+//                        JSONArray jsonArray = jsonObject.getJSONArray("data");
+//                        for(Object o:jsonArray){
+//                            String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
+//                            if(name.equals(taskName)) {
+//
+//                            }
+//                        }
+                        if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.安装负责人指定项目资料员.getName();
+                        }
+                        if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.安装开工资料提交.getName();
+                        }
+                        if(ProjectInitiationEnum.安装开工资料提交.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.安装资料审核.getName();
+                        }
+                        if(ProjectInitiationEnum.安装资料审核.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.安装资料审批.getName();
+                        }
+                        if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.设计负责人指定项目资料员.getName();
+                        }
+                        if(ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.设计开工资料提交.getName();
+                        }
+                        if(ProjectInitiationEnum.设计开工资料提交.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.设计资料审核.getName();
+                        }
+                        if(ProjectInitiationEnum.设计资料审核.getName().equals(taskName)){
+                            taskName = ProjectInitiationEnum.设计资料审批.getName();
                         }
                         taskService.saveOrUpdateTask(taskName, false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
                     } else {