fix（设备注销）:修改代办中startuser

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

@@ -69,6 +69,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】";
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
@@ -82,20 +83,28 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
     @Autowired
-    private OtherInfoMapper otherInfoMapper;
-    @Autowired
     RedisUtils redisUtils;
     @Autowired
     IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
     @Autowired
+    private OtherInfoMapper otherInfoMapper;
+    @Autowired
     private JgScrapCancelEqServiceImpl jgScrapCancelEqService;
     @Autowired
     private JgScrapCancelEqMapper jgScrapCancelEqMapper;
     @Autowired
     private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
-    private static String template = "来自电梯【%s】【%s】的业务办理，【申请单号：%s】";
+
+    /**
+     * 移装移装报废/注销报废判断
+     *
+     * @return
+     */
+    public static BusinessTypeEnum businessTypeJudgment(String type) {
+        return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE;
+    }
 
     public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         ReginParams reginParams = this.getSelectedOrgInfo();
@@ -158,8 +167,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         map1.put("SEQUENCE_NBR", model.getSEQUENCE_NBR());
         deviceList.add(map1);
         // 获取告知单号
-        ResponseModel<List<String>> listResponseModel =
-                tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error(" 获取告知单号失败");
             throw new RuntimeException();
@@ -253,15 +261,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancelEqService.saveBatch(jgScrapCancelEqList);
     }
 
-    /**
-     * 移装移装报废/注销报废判断
-     *
-     * @return
-     */
-    public static BusinessTypeEnum businessTypeJudgment(String type) {
-        return "1".equals(type) ? BusinessTypeEnum.JG_EQUIPMENT_CANCEL : BusinessTypeEnum.JG_EQUIPMENT_MOVE;
-    }
-
     private void createTaskModel(JgScrapCancel dto, 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)) {
@@ -414,7 +413,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     private void executeOneStep(JgScrapCancelDto jgScrapCancelDto, String taskName, String nextUserIds, String operate) {
-        ReginParams reginParams = this.getSelectedOrgInfo();
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
         taskV2Model.setTaskDesc("");
@@ -429,9 +427,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
         taskV2Model.setFlowStatus(this.getTaskStatusByName(jgScrapCancelDto.getAuditStatus()));
         taskV2Model.setFlowStatusLabel(jgScrapCancelDto.getAuditStatus());
-        taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
-        taskV2Model.setStartUser(reginParams.getUserModel().getUserName());
-        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
+        taskV2Model.setTaskType(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getCode());
+        taskV2Model.setStartUser(jgScrapCancelDto.getRecUserName());
+        taskV2Model.setTaskTypeLabel(businessTypeJudgment(jgScrapCancelDto.getCancelType()).getName());
         taskV2Model.setStartDate(jgScrapCancelDto.getCreateDate());
         taskV2Model.setStartUserId(jgScrapCancelDto.getCreateUserId());
         taskV2Model.setStartUserCompanyName(jgScrapCancelDto.getUseUnitName());
@@ -543,9 +541,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
-            if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus()) &&
-                    (jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getReject()) ||
-                            jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack()))) {
+            if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus()) && (jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getReject()) || jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack()))) {
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);