代码提交

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

@@ -451,7 +451,11 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                     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())
+                            || 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);
@@ -687,6 +691,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
     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;
+        if(firstName.equals(ProjectInitiationEnum.安装资料审批) || firstName.equals(ProjectInitiationEnum.设计资料审批)) {
+            return "流程结束！";
+        } else {
             try {
                 AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
                 dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -761,6 +768,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             }
             return taskName;
         }
+    }
 
     @Autowired
     OrgServiceImpl orgService;