代码提交

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TaskController.java

@@ -195,7 +195,7 @@ public class TaskController {
         List<Task> list = page.getRecords();
         for(Task task : list){
             task.setLabel(task.getContent());
-            task.setValue(task.getExtend()+"&sequenceNbr="+task.getSourceId());
+            task.setValue(task.getExtend()+"&sequenceNbr="+task.getSourceId()+"&projectId="+task.getSourceId());
             if(task.getStatus() == 1){
                 if(!ValidationUtil.isEmpty(task.getExtendId())){
                     if(task.getExtendId()!=-1L) {

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

@@ -346,6 +346,10 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             unitIds.add(project.getConstructionUnitId());
             taskType = TaskTypeEnum.填报.getKey();
         }
+        if (ProjectInitiationEnum.建设负责人指定项目负责人.getName().equals(project.getStatus()) || ProjectInitiationEnum.建设负责人指定项目资料员.getName().equals(project.getStatus())) {
+            unitIds.add(project.getConstructionUnitId());
+            taskType = TaskTypeEnum.填报.getKey();
+        }
         if ( ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(project.getStatus())  ||
             ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(project.getStatus())  ) {
             if(OrgEnum.安装单位.getKey().equals(orgService.getReginParams().getBusinessInfo().getCompanyType())){
@@ -611,13 +615,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 taskName = taskName + "/" + sjStatus;
             }
         }
-//        if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
-//            if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
-//                taskName = StringUtils.substringBefore(project.getStatus(), "/");
-//            } else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
-//                taskName = StringUtils.substringAfter(project.getStatus(), "/");
-//            }
-//        }
+        if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
+            if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
+                taskName = StringUtils.substringBefore(project.getStatus(), "/");
+            } else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
+                taskName = StringUtils.substringAfter(project.getStatus(), "/");
+            }
+        }
 
         project.setStatus(taskName);
         projectService.updateById(project);