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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintainNoticeDto.java

@@ -211,7 +211,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     private String nextTaskId;
 
-    private String equListName;
+    private String equList;
 
     private String supervisoryCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -322,7 +322,7 @@ public class JgMaintainNotice extends BaseEntity {
     private String nextTaskId;
 
     @TableField(exist = false)
-    private String equListName;
+    private String equList;
 
     @TableField(exist = false)
     private String supervisoryCode;

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

@@ -158,7 +158,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 taskName[0] = processTasks.get(0).getNextTask().get(0).getName();
                 List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(processTasks);
                 nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
-                this.buildRoleList(processTasks, roleListNext, roleListAll);
             } catch (Exception e) {
                 log.error("提交失败：{}", e);
                 throw new BadRequest("提交失败" + e.getMessage());

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

@@ -354,10 +354,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         WorkflowResultDto workflowResult = new WorkflowResultDto();
         JgChangeRegistrationTransfer transfer = this.getById(id);
         try {
+            String taskId = transfer.getNextTaskId();
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
             dto.setResultCode("approvalStatus");
-            dto.setTaskId(transfer.getNextTaskId());
+            dto.setTaskId(taskId);
             dto.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
             map.put("approvalStatus", operate);
@@ -366,7 +367,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 map.put("approvalStatus", "提交");
             }
             //执行流程
-            ProcessTaskDTO complete = icmWorkflowService.complete(instanceId, dto);
+            ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
             workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
 
         } catch (Exception e) {
@@ -1044,7 +1045,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
                 toDoTask.setTaskStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setTaskStatusLabel(transfer.getStatus());
-                String url = this.getUrl(JG_CHANGE_REGISTRATION.getCode(), "look");
+                String url = this.getUrl(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode(), "look");
                 String format = String.format(url, transfer.getSequenceNbr(), transfer.getNextExecutorIds(), transfer.getNextExecutorIds(),
                         transfer.getAuditStatus(), transfer.getInstanceId());
                 toDoTask.setRoutePath(format);

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

@@ -428,7 +428,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
             }
-            dto.setEquListName(obj.get("EQU_LIST").toString());
+            dto.setEquList(obj.get("EQU_LIST").toString());
             dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -486,7 +486,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setModel(item);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquListName(), item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
         });
         commonService.buildTaskModel(taskModelDtoList);

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

@@ -213,7 +213,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             BeanUtils.copyProperties(model, dto);
             String applyNo = applyNoList.get(i);
             LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
-            otherLambda.eq(OtherInfo::getRecord, equipList.get(i).getEquId());
+            otherLambda.eq(OtherInfo::getRecord, deviceList.get(i).get("SEQUENCE_NBR"));
             OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
             String supervisoryCode = otherInfo.getSupervisoryCode();
             dto.setSupervisoryCode(supervisoryCode);