代码提交

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

@@ -307,10 +307,8 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
 
                 //更新任务表的状态 已办
                 taskType = getUnitId(unitIds, project, superviseRule);
-//            if(ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus())){
-//                project.setStatus(ProjectInitiationEnum.提交资料.getName());
-//            }
-                taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
+
+                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);
@@ -323,7 +321,23 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                     }
                     unitIds = new ArrayList<>();
                     taskType = getUnitId(unitIds, project, superviseRule);
-                    taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds, extendId, instanceId);
+
+                    if(project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName())
+                            || project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目资料员.getName())
+                            || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目负责人.getName())
+                            || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName())
+                    ) {
+                        AjaxResult ajaxResultR = Workflow.taskClient.getTask(instanceId);
+                        dataObject = JSON.parseObject(JSON.toJSONString(ajaxResultR.get("data")));
+                        try {
+                            taskName=dataObject.getString("name");
+                        }catch (Exception e) {
+                            log.error("当前流程名称为空");
+                        }
+                        taskService.saveOrUpdateTask(taskName, false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
+                    } else {
+                        taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds, extendId, instanceId);
+                    }
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -350,8 +364,8 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             unitIds.add(project.getConstructionUnitId());
             taskType = TaskTypeEnum.流程.getKey();
         }
-        if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus())  || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(project.getStatus())  ||
-            ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(project.getStatus())) {
+        if (project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目负责人.getName())  || project.getStatus().contains(ProjectInitiationEnum.设计负责人指定项目资料员.getName())  ||
+                project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目资料员.getName()) || project.getStatus().contains(ProjectInitiationEnum.安装负责人指定项目负责人.getName())) {
             if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
                 unitIds.add(project.getInstallationUnitId());
             } else if(OrgEnum.设计单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){