Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -179,7 +179,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         // 仅保存
         if ("add".equals(pageType)) {
             this.save(jgEnableDisable);
-            buildTask(Arrays.asList(jgEnableDisable),businessCode, workflowResultList,Boolean.FALSE);
+            buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.FALSE);
             if(!SUBMIT_TYPE_FLOW.equals(submit)){
                 // 暂存任务
                 buildTaskDraft(jgEnableDisable);
@@ -215,7 +215,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             BeanUtils.copyProperties(jgEnableDisable, taskMessageDto);
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSequenceNbr(), jgEnableDisable.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", jgEnableDisable.getEquList(), jgEnableDisable.getSupervisoryCode(), jgEnableDisable.getApplyNo()));
             //申请单号
             dto.setTaskCode(jgEnableDisable.getApplyNo());
             //业务类型枚举code值
@@ -242,22 +242,21 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setApplyType(map.getString("applyType"));
         jgEnableDisable.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-        jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-        jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
-            jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
-            jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
-            jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
-        }
-        jgEnableDisable.setEquList(map.get("equListDesc").toString());
-        jgEnableDisable.setSupervisoryCode(map.get("supervisoryCode").toString());
-        if (!CollectionUtils.isEmpty(workflowResultList)) {
-            jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
-            jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+            if (!CollectionUtils.isEmpty(workflowResultList)) {
+                jgEnableDisable.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
+                jgEnableDisable.setInstanceId(workflowResultList.get(0).getInstanceId());
+                jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getName()));
+                jgEnableDisable.setNextExecutorIds(workflowResultList.get(0).getNextExecutorRoleIds());
+                jgEnableDisable.setExecuteSequence(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
+                jgEnableDisable.setPromoter(reginParams.getUserModel().getUserId());
+                jgEnableDisable.setNextTaskId(workflowResultList.get(0).getNextTaskId());
+            }
         } else {
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
+        jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
+        jgEnableDisable.setSupervisoryCode(String.valueOf(map.get("supervisoryCode")));
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
     }
@@ -270,16 +269,17 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         String  taskType = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getCode():BusinessTypeEnum.JG_EQUIPMENT_STOP.getCode();
         String  taskTypeLabel = businessCode.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode())?BusinessTypeEnum.JG_EQUIPMENT_START.getName():BusinessTypeEnum.JG_EQUIPMENT_STOP.getName();
         List<TaskModelDto> taskModelDtoList = new ArrayList<>();
-        WorkflowResultDto workflowResultDto = workflowResultList.get(0);
         list.forEach(item -> {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(item.getCreateDate());
-            taskModelDto.setTaskName(workflowResultDto.getNextTaskName()); // 工作流API返回
+            if(workflowResultList.size()>0){
+                taskModelDto.setTaskName(workflowResultList.get(0).getNextTaskName()); // 工作流API返回
+                taskModelDto.setExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds()); // 工作流API返回
+            }
             taskModelDto.setTaskCode(item.getApplyNo());
             taskModelDto.setTaskType(taskType);
             taskModelDto.setTaskTypeLabel(taskTypeLabel);
             taskModelDto.setRelationId(item.getInstanceId());
-            taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
             taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
@@ -299,7 +299,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 commonService.deleteTaskModel(item.getSequenceNbr()+"");
             }
         });
-        commonService.buildTaskModel(taskModelDtoList);
+        if(bool){
+            commonService.buildTaskModel(taskModelDtoList);
+        }
     }