代码提交

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

@@ -523,7 +523,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
      * @param instanceId
      * @return
      */
-    public String getFlowTaskName(String InitiationStatus, boolean status, String taskType, Date sendTime, Long sourceId, String type, List<Long> unitIds,Long extendId, String instanceId){
+    public String getFlowTaskName(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;
         try {
@@ -540,11 +540,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                     return ProjectInitiationEnum.修改资料.getName();
                 }
                 if(ProjectInitiationEnum.安装负责人指定项目负责人.getName().equals(name)){
+                    unitIds.add(project.getInstallationUnitId());
                     if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.安装负责人指定项目负责人.getName())) {
                         taskService.saveOrUpdateTask(ProjectInitiationEnum.安装负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
                     }
                 }
                 if(ProjectInitiationEnum.设计负责人指定项目负责人.getName().equals(name)){
+                    unitIds.add(project.getDesignUnitId());
                     if(!taskService.findTheTask(instanceId,ProjectInitiationEnum.安装负责人指定项目负责人.getName())) {
                         taskService.saveOrUpdateTask(ProjectInitiationEnum.设计负责人指定项目负责人.getName(), false, taskType, sendTime, sourceId, TaskTypeEnum.项目立项.getKey(), unitIds,extendId, instanceId);
                     }
@@ -574,7 +576,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Project::getInstanceId,instanceId);
         Project project = projectService.getOne(wrapper);
-        String taskName = getFlowTaskName(InitiationStatus, status, taskType, sendTime, sourceId, type, unitIds,extendId, instanceId);
+        String taskName = getFlowTaskName(project, status, taskType, sendTime, sourceId, type, unitIds,extendId, instanceId);
         boolean bool = true;
         if (( project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName()) || project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) && "流程结束！".equals(taskName)){
             bool = false;

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

@@ -159,7 +159,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                 }
                 task.setContent(title + ", " + taskStatus);
                 task.setInstanceId(instanceId);
-                List<String> roleList = getRoleList(instanceId);
+                List<String> roleList = getRoleList(instanceId, InitiationStatus);
                 if (!ObjectUtils.isEmpty(roleList)) {
                     String join = String.join(",", roleList);
                     task.setRoleIds(join);
@@ -186,7 +186,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
             task.setType(TaskTypeEnum.项目资料补充.getKey());
             task.setTitle(title);
             task.setContent(title + ", 待审批");
-            List<String> roleList = getRoleList(instanceId);
+            List<String> roleList = getRoleList(instanceId, "");
             if (!ObjectUtils.isEmpty(roleList)) {
                 String join = String.join(",", roleList);
                 task.setRoleIds(join);
@@ -196,13 +196,32 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
 
     }
 
-    public List<String> getRoleList(String instanceId) {
+    public List<String> getRoleList(String instanceId,String processName) {
         ArrayList<String> roleIds = new ArrayList<>();
         try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
-            JSONObject data = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-            if (!ObjectUtils.isEmpty(data)) {
-                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(data.get("id")));
+//            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+//            JSONObject data = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTaskList(instanceId)));
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            if(jsonArray.size() > 1) {
+                for(Object o:jsonArray){
+                    String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
+                    if(processName.equals(name)){
+                        AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id")));
+                        if (!ObjectUtils.isEmpty(taskGroupName)) {
+                            JSONArray data2 = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                            if (!ObjectUtils.isEmpty(data2)) {
+                                data2.forEach(item -> {
+                                    Map item1 = (Map) item;
+                                    roleIds.add(String.valueOf(item1.get("groupId")));
+                                });
+                            }
+                        }
+                    }
+                }
+            } else if(jsonArray.size() == 1) {
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).getString("id")));
                 if (!ObjectUtils.isEmpty(taskGroupName)) {
                     JSONArray data2 = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                     if (!ObjectUtils.isEmpty(data2)) {