fix(jg)：移装变更接口修改

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

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
@@ -67,8 +66,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
 /**
  * 移装变更登记登记服务实现类
@@ -589,12 +588,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //移装变更详情
         JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr);
         //查询设备详情
-        //String equipId = jgChangeRegistrationTransferEqMapper.getEquipIdByEquipTransferId(sequenceNbr);
-
+        JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
         if (ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transfer.getStatus())) {
             // 执行完成时查询历史表
-            JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
             if (!ValidationUtil.isEmpty(historyData)) {
                 Map<String, Object> newPosition = JSON.parseObject(historyData.getChangeData(), Map.class);
                 resultDataMap.putAll(newPosition);
@@ -606,15 +603,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
         } else {
             // 非执行完成状态显示最新设备信息
-            //Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
-            //resultDataMap.putAll(equipDetailMap);
+            Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
+            List<JgUseRegistrationManage> registrationList = (List<JgUseRegistrationManage>) changeData.get("registrationList");
+            List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
+            List<JgUseRegistrationManage> newRegistrationList = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
             if (!ValidationUtil.isEmpty(transfer)) {
                 Map<String, Object> transferToMap = Bean.BeantoMap(transfer);
                 resultDataMap.putAll(transferToMap);
             }
-            JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
-                    .eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
-            Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
             // 省市区街道字段等业务字段
             resultDataMap.put("transferProvince", changeData.get("transferProvince"));
             resultDataMap.put("transferCity", changeData.get("transferCity"));
@@ -631,7 +627,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             resultDataMap.put("transferUseInfo", changeData.get("transferUseInfo"));
             //resultDataMap.put("useInnerCode", equipDetailMap.get("equCode"));
             resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
-            resultDataMap.put("registrationList", changeData.get("registrationList"));
+            resultDataMap.put("registrationList", newRegistrationList);
         }
         String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
         if (StringUtil.isNotEmpty(transferSafetyManager)) {
@@ -955,10 +951,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
     private void updateUseRegistrationManage(JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
         JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
-        List<Map<String, Object>> registrationList = (List<Map<String, Object>>) historyJson.get("registrationList");
-        List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
-        List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
-        for (JgUseRegistrationManage registrationManage : list) {
+        List<JgUseRegistrationManage> registrationList = (List<JgUseRegistrationManage>) historyJson.get("registrationList");
+        for (JgUseRegistrationManage registrationManage : registrationList) {
             registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
             registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
             registrationManage.setAuditPassDate(transfer.getAuditPassDate());
@@ -967,7 +961,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 registrationManage.setUseRegistrationCode(useRegistrationCode);
             }
         }
-        useRegistrationManageService.updateBatchById(list);
+        useRegistrationManageService.updateBatchById(registrationList);
+        historyData.setChangeData(JSONObject.toJSONString(registrationList));
     }
 
     /**
@@ -1368,12 +1363,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     /**
      * 新增代办任务
      */
-    private void createToDoTask(List<WorkflowResultDto> sorkflows, JgChangeRegistrationTransfer transfer, String submitType) {
-        if (!ValidationUtil.isEmpty(sorkflows)) {
+    private void createToDoTask(List<WorkflowResultDto> workflows, JgChangeRegistrationTransfer transfer, String submitType) {
+        if (!ValidationUtil.isEmpty(workflows)) {
             List<TaskModelDto> toDoTasklist = new ArrayList<>();
-            for (WorkflowResultDto sorkflow : sorkflows) {
+            for (WorkflowResultDto workflow : workflows) {
                 TaskModelDto toDoTask = new TaskModelDto();
-                toDoTask.setTaskName(sorkflow.getTaskName());
+                toDoTask.setTaskName(workflow.getTaskName());
                 toDoTask.setFlowCreateDate(transfer.getCreateDate());
                 toDoTask.setTaskCode(transfer.getApplyNo());
                 toDoTask.setTaskContent(this.getSummaryInfo(transfer));
@@ -1381,13 +1376,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
                 toDoTask.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                 toDoTask.setRelationId(transfer.getInstanceId());
-                toDoTask.setExecuteUserIds(sorkflow.getNextExecutorUserIds());
+                toDoTask.setExecuteUserIds(workflow.getNextExecutorUserIds());
                 FlowStatusEnum flowStatusEnum = this.getTaskStatus(submitType);
                 toDoTask.setTaskStatus(flowStatusEnum.getCode());
                 toDoTask.setTaskStatusLabel(flowStatusEnum.getName());
                 toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setFlowStatusLabel(transfer.getStatus());
-                toDoTask.setFlowCode(sorkflow.getNextTaskId());
+                toDoTask.setFlowCode(workflow.getNextTaskId());
                 toDoTask.setStartUserId(transfer.getCreateUserId());
                 toDoTask.setStartUser(transfer.getCreateUserName());
                 toDoTask.setStartUserCompanyName(transfer.getCreateUserCompanyName());