fix（注销报废）:添加代办任务model字段传参dto

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/JgScrapCancelServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
@@ -67,7 +68,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PAGE_KEY = "jgScrapCancelAdd";
-    private static String template = "来自电梯【%s】【%s】的业务办理，【申请单号：%s】";
+    private static final String template = "来自电梯【%s】【%s】的业务办理，【申请单号：%s】";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -98,7 +99,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     /**
      * 移装移装报废/注销报废判断
      *
-     * @return
+     * @return BusinessTypeEnum 业务对应枚举
      */
     public static BusinessTypeEnum businessTypeJudgment(String type) {
         return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE;
@@ -185,7 +186,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             return;
         }
         // 判断当前是否为提交
-        List<String> instanceIdList = new ArrayList<>();
         List<WorkflowResultDto> workflowResultDtos = null;
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 发起流程
@@ -252,8 +252,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         this.saveBatch(list);
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 新增代办
-            for (int i = 0; i < list.size(); i++) {
-                this.createTaskModel(list.get(i), taskName[0], submitType, nextUserIds);
+            for (JgScrapCancel jgScrapCancel : list) {
+                this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
             }
         }
         List<JgScrapCancelEq> jgScrapCancelEqList = equipList.stream().map(t -> {
@@ -264,31 +264,35 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancelEqService.saveBatch(jgScrapCancelEqList);
     }
 
-    private void createTaskModel(JgScrapCancel dto, String taskName, String submitType, String nextUserIds) {
+    private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("1".equals(submitType)) {
             TaskModelDto taskModelDto = new TaskModelDto();
-            taskModelDto.setFlowCreateDate(dto.getCreateDate());
+            taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
             taskModelDto.setTaskName(taskName);
-            taskModelDto.setTaskCode(dto.getApplyNo());
-            taskModelDto.setTaskContent(this.buildTaskContent(dto.getSupervisoryCode(), dto.getCancelType(), dto.getApplyNo()));
+            taskModelDto.setTaskCode(scrapCancel.getApplyNo());
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
+                    scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskDesc("");
-            taskModelDto.setTaskType(businessTypeJudgment(dto.getCancelType()).getCode());
-            taskModelDto.setTaskTypeLabel(businessTypeJudgment(dto.getCancelType()).getName());
-            taskModelDto.setRelationId(dto.getInstanceId());
+            taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
+            taskModelDto.setTaskTypeLabel(businessTypeJudgment(scrapCancel.getCancelType()).getName());
+            taskModelDto.setRelationId(scrapCancel.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
             FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
             taskModelDto.setTaskStatus(flowStatusEnum.getCode());
             taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
-            taskModelDto.setFlowStatus(this.getTaskStatusByName(dto.getAuditStatus()));
-            taskModelDto.setFlowStatusLabel(dto.getAuditStatus());
-            taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setFlowCode(dto.getNextTaskId());
+            taskModelDto.setFlowStatus(this.getTaskStatusByName(scrapCancel.getAuditStatus()));
+            taskModelDto.setFlowStatusLabel(scrapCancel.getAuditStatus());
+            taskModelDto.setStartUserId(scrapCancel.getCreateUserId());
+            taskModelDto.setFlowCode(scrapCancel.getNextTaskId());
             taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
-            taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
-            taskModelDto.setNextExecuteUser(dto.getNextExecuteIds());
-            taskModelDto.setStartDate(dto.getCreateDate());
-            taskModelDto.setModel(dto);
+            taskModelDto.setStartUserCompanyName(scrapCancel.getUseUnitName());
+            taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
+            taskModelDto.setStartDate(scrapCancel.getCreateDate());
+            TaskMessageDto taskMessageDto = new TaskMessageDto();
+            BeanUtils.copyProperties(scrapCancel, taskMessageDto);
+            taskMessageDto.setStatus(scrapCancel.getAuditStatus());
+            taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
         }
     }
@@ -444,7 +448,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
-        modelDto.setModel(jgScrapCancelDto);
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
+        taskMessageDto.setStatus(jgScrapCancelDto.getAuditStatus());
+        modelDto.setModel(taskMessageDto);
         commonService.buildTaskModel(Collections.singletonList(modelDto));
     }
 
@@ -521,7 +528,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(workflowResultDto.getNextTaskName())) {
-            jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode()).getRollBack());
+            jgScrapCancel.setAuditStatus(Objects.requireNonNull(WorkFlowStatusEnum.getMessage(workflowResultDto.getNextTaskCode())).getRollBack());
         }
         jgScrapCancel.setNextTaskId(workflowResultDto.getNextTaskId());
         List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
@@ -579,7 +586,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         String taskName = "";
         String nextTaskId = "";
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(sequenceNbr);
-        if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
+        if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();
             nextTaskId = processTaskDTO.getNextTask().get(0).getId();
@@ -601,10 +608,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             }
             if ("0".equals(operate)) {
                 // 通过操作
-                jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
+                jgScrapCancel.setAuditStatus(Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getPass());
             } else {
                 // 驳回操作
-                jgScrapCancel.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
+                jgScrapCancel.setAuditStatus(Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getReject());
                 jgScrapCancel.setPromoter(null);
             }
             JgScrapCancelDto scrapCancelDto = new JgScrapCancelDto();