1.注销报废 + 停用启用 + 维保 + 设备移交详情修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -56,15 +56,14 @@ public class JgScrapCancelController extends BaseController {
     public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
                                                       @RequestBody Map<String, Object> model,
                                                       @RequestParam(value = "op", required = false) String op) {
-        JgScrapCancelDto jgScrapCancelDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("jgScrapCancelAdd")), JgScrapCancelDto.class, true);
+
+        JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(model.get("jgScrapCancelAdd")), JgScrapCancelDto.class);
         if (Objects.isNull(jgScrapCancelDto)) {
             throw new IllegalArgumentException("参数jgScrapCancelAdd不能为空");
         }
-        Object o = ((LinkedHashMap<?, ?>) model.get("jgScrapCancelAdd")).get("cancelCertificateList");
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(model.get("jgScrapCancelAdd")));
-        jgScrapCancelDto.setCancelCertificateList((List<Map<String, Object>>) o);
         jgScrapCancelDto.setSEQUENCE_NBR(String.valueOf(jsonObject.get("record")));
-        return ResponseHelper.buildResponse(jgScrapCancelService.updateInfo(submitType, jgScrapCancelDto, op));
+        return ResponseHelper.buildResponse(jgScrapCancelService.updateInfo(submitType, jgScrapCancelDto, op, jsonObject));
     }
 
 

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

@@ -1570,7 +1570,6 @@ public class CommonServiceImpl implements ICommonService {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
-        lambda.eq(JgRegistrationHistory::getRegistrationClass, registrationClass);
         Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
         if (integer > 0) {
             jgRegistrationHistory.setChangeData(JSON.toJSONString(json));

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

@@ -634,11 +634,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
         if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
             Map<String, Object> maintenanceRecordInfoMap;
+
             if (!ValidationUtil.isEmpty(fieldType)) {
                 maintenanceRecordInfoMap = Bean.BeantoMap(maintenanceRecordInfo);
+                maintenanceRecordInfoMap.put("repairInform", JSON.parse(maintenanceRecordInfo.getRepairInform()));
                 maintenanceRecordInfoMap.put("maintenancerecordinfoSeq", maintenanceRecordInfo.getSequenceNbr());
             } else {
-                maintenanceRecordInfoMap = convertCamelToUnderscore(maintenanceRecordInfo, null);
+                String[] toArrayFields = {"repairInform"};
+                maintenanceRecordInfoMap = convertCamelToUnderscore(maintenanceRecordInfo, toArrayFields);
                 maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
             }
             if (!maintenanceRecordInfoMap.isEmpty()) {

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

@@ -613,7 +613,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
     private void updateHistoryAsync(List<JgChangeRegistrationUnitEq> jgRelationEquipList) {
         jgRelationEquipList.forEach(j->{
-            commonService.saveOrUpdateHistory(null,getEquipInfoJson(j.getUnitChangeRegistrationId()) , j.getEquId(), j.getUnitChangeRegistrationId());
+            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName(),getEquipInfoJson(j.getUnitChangeRegistrationId()) , j.getEquId(), j.getUnitChangeRegistrationId());
         });
     }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -112,7 +113,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         WorkflowResultDto workflowResultDto = new WorkflowResultDto();
         List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
 
-        String instanceId = "";
         jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString());
         jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString());
 
@@ -224,9 +224,20 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
             jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
         }
+        // 保存历史表
+        commonService.saveOrUpdateHistory(this.getRegistrationClass(jgEnableDisable), map, record, jgEnableDisable.getSequenceNbr().toString());
         return Collections.singletonList(jgEnableDisable);
     }
 
+    private String getRegistrationClass(JgEnableDisable jgEnableDisable){
+        // 1启用，0停用
+        if("1".equals(jgEnableDisable.getApplyType())){
+            return BusinessTypeEnum.JG_EQUIPMENT_START.getName();
+        } else {
+            return BusinessTypeEnum.JG_EQUIPMENT_STOP.getName();
+        }
+    }
+
     /**
      * 暂存任务生成待办
      * @param jgEnableDisable 业务信息
@@ -649,21 +660,36 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {
-        Map<String,Object> resultMap = this.baseMapper.getDetail(sequenceNbr);
-        JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
-        if(!ObjectUtils.isEmpty(jgEnableDisableEq)){
-            Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgEnableDisableEq.getEquId());
-            String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
-                    "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-            for (String s : fields) {
-                if (map.containsKey(s) && !ObjectUtils.isEmpty(map.get(s)))
-                    map.put(s, JSON.parseArray(map.get(s).toString()));
+        Map<String, Object> resultMap = new HashMap<>();
+        JgEnableDisable enableDisable = this.getById(sequenceNbr);
+        Map<String, Object> beanMap = BeanUtil.beanToMap(enableDisable, false, true);
+        if(enableDisable.getAuditStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
+            // 完成状态查询历史表
+            JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr);
+            // 兼容老业务
+            if(jsonObject == null){
+                // 老数据逻辑
+                fillRuntimeEquipInfoData(sequenceNbr, resultMap);
+            } else {
+                // 新数据逻辑
+                resultMap.putAll(jsonObject);
             }
-            resultMap.putAll(map);
+            resultMap.putAll(beanMap);
+        } else {
+            // 其他状态显示实时数据
+            fillRuntimeEquipInfoData(sequenceNbr, resultMap);
+            resultMap.putAll(beanMap);
         }
-        resultMap.put("sequenceNbr", sequenceNbr);
+        resultMap.put("receiveOrgCode", enableDisable.getReceiveCompanyCode() + '_' + enableDisable.getReceiveOrgName());
         return resultMap;
+    }
 
+    private void fillRuntimeEquipInfoData(Long sequenceNbr, Map<String, Object> resultMap) {
+        JgEnableDisableEq jgEnableDisableEq = jgEnableDisableEqMapper.selectOne(new LambdaQueryWrapper<JgEnableDisableEq>().eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
+        if (!ObjectUtils.isEmpty(jgEnableDisableEq)) {
+            Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgEnableDisableEq.getEquId());
+            resultMap.putAll(map);
+        }
     }
 
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
@@ -12,6 +13,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.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -138,9 +140,24 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
         jgEquipTransferEqMapper.insertBatchSomeColumn(jgEquipTransferEqList);
         this.updateRedisBatch(transferList);
+        // 创建历史数据
+        this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
         return transferList;
     }
 
+    private void saveOrUpdateHisDataBatch(List<JgEquipTransferEq> jgEquipTransferEqList) {
+        jgEquipTransferEqList.forEach(j->{
+            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName(),getEquipInfoJson(j.getEquId()) , j.getEquId(), j.getEquipTransferId());
+        });
+    }
+
+    private JSON getEquipInfoJson(String record) {
+        Map<String, Object> equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);;
+        equipMap.remove("useUnitCreditCode");
+        return new JSONObject(equipMap);
+    }
+
+
     private void updateRedisBatch(List<JgEquipTransfer> transferList) {
         transferList.stream().filter(n -> StringUtil.isNotEmpty(n.getInstanceId())).forEach(jgEquipTransfer -> {
             commonService.saveExecuteFlowData2Redis(jgEquipTransfer.getInstanceId(), this.buildInstanceRuntimeData(jgEquipTransfer));
@@ -352,9 +369,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             BeanUtils.copyProperties(equipTransferDto, equipTransfer);
             updateById(equipTransfer);
         }
+        this.updateHistorySingle(equipTransferDto.getSequenceNbr());
         return equipTransferDto;
     }
 
+    private void updateHistorySingle(Long seq){
+        List<JgEquipTransferEq> eqs = jgEquipTransferEqMapper.selectList(new LambdaQueryWrapper<JgEquipTransferEq>().eq(JgEquipTransferEq::getEquipTransferId,seq));
+        this.saveOrUpdateHisDataBatch(eqs);
+    }
     /**
      * 通过和驳回
      *
@@ -549,15 +571,37 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     @Override
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
         JgEquipTransfer equipTransfer = baseMapper.selectById(sequenceNbr);
-
         if (Objects.isNull(equipTransfer)) {
             return null;
         }
+        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+        if(FlowStatusEnum.TO_BE_FINISHED.getCode() == Integer.parseInt(equipTransfer.getApplyStatus())){
+            // 已完成状态显示历史数据
+            // 1.设备历史信息
+            JSONObject his = commonService.queryHistoryData(sequenceNbr);
+            // 兼容老数据
+            if(his == null){
+                // 1.设备信息
+                Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
+                // 2.移交业务字段信息
+                equipMap.putAll(equipTransferInfo);
+                return equipMap;
+            } else {
+                // 2.移交业务字段信息
+                his.putAll(equipTransferInfo);
+                return his;
+            }
+        } else {
+            Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
+            return Stream.concat(equipTransferInfo.entrySet().stream(),
+                    equipMap.entrySet().stream())
+                    .filter(entry -> entry.getValue() != null)
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
+        }
 
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
-                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
-                "proxyStatementAttachment", "installContractAttachment"};
+    }
 
+    private Map<String, Object> getEquipInfonNew(Long sequenceNbr) {
         List<Map<String, Object>> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
         Map<String, Object> equipMap = null;
         if (equipmentInfos != null && !equipmentInfos.isEmpty()) {
@@ -566,22 +610,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
             }
         }
-
-        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
-
-        handleJsonArrayFields(equipTransferInfo, fields);
-        handleJsonArrayFields(equipMap, fields);
-
-        return Stream.concat(equipTransferInfo.entrySet().stream(),
-                equipMap.entrySet().stream())
-                .filter(entry -> entry.getValue() != null)
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
-    }
-
-    private void handleJsonArrayFields(Map<String, Object> map, String[] fields) {
-        for (String field : fields) {
-            map.computeIfPresent(field, (key, value) -> JSON.parseArray(value.toString()));
-        }
+        return equipMap;
     }
 
     /**
@@ -711,7 +740,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     }
 
     private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
-        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
+        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer ,false , true));
         equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }

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

@@ -522,7 +522,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         }
         updateById(contract);
         // 设备数据存历史数据，在流程完成时使用
-        commonService.saveOrUpdateHistory(null, JSON.parseArray(JSON.toJSONString(equipmentLists)), null, contract.getSequenceNbr().toString());
+        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName(), JSON.parseArray(JSON.toJSONString(equipmentLists)), null, contract.getSequenceNbr().toString());
         return Collections.singletonList(contract);
     }
 

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

@@ -160,7 +160,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     @Transactional(rollbackFor = Exception.class)
     public JgScrapCancel save(String submitType, Map<String, Object> mapParams) {
         ReginParams reginParams = this.getSelectedOrgInfo();
-        Map<?, ?> noticeParams = (Map) mapParams.get(PAGE_KEY);
+        Map<String, Object> noticeParams = (Map) mapParams.get(PAGE_KEY);
         String equipId = String.valueOf(noticeParams.get("record"));
         String[] receiveOrg = String.valueOf(noticeParams.get("receiveOrgCreditCode")).split("_");
         noticeParams.remove("record");
@@ -254,12 +254,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         jgScrapCancelEqService.save(jgRelationEquip);
         String equListName = EquipmentClassifityEnum.getNameByCode(jgScrapCancel.getEquList());
         jgScrapCancel.setEquListDesc(equListName);
-        jgScrapCancel.setCancelTypeDesc("1".equals(jgScrapCancel.getCancelType()) ? "报废注销" : "移装注销");
+        jgScrapCancel.setCancelTypeDesc(getRegistrationClass(jgScrapCancel.getCancelType()));
 
         commonService.saveExecuteFlowData2Redis(instanceId, buildInstanceRuntimeData(jgScrapCancel));
+        save2HisData(noticeParams, equipId, jgRelationEquip, jgScrapCancel);
         return jgScrapCancel;
     }
 
+    private void save2HisData(Map<String, Object> noticeParams, String equipId, JgScrapCancelEq jgRelationEquip, JgScrapCancel jgScrapCancel) {
+        noticeParams.put("record", equipId);
+        commonService.saveOrUpdateHistory(jgScrapCancel.getCancelTypeDesc(), new JSONObject(noticeParams), jgRelationEquip.getEquId(), jgScrapCancel.getSequenceNbr().toString());
+    }
+
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
         ReginParams reginParams = this.getSelectedOrgInfo();
         TaskModelDto taskModelDto = new TaskModelDto();
@@ -337,7 +343,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
+    public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op, JSONObject pageData) {
 
         if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
@@ -436,9 +442,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             jgScrapCancelEq.setEquId(jgScrapCancelDto.getRecord());
             jgScrapCancelEqMapper.update(jgScrapCancelEq, updateWrapper);
         }
+        commonService.saveOrUpdateHistory(getRegistrationClass(jgScrapCancelDto.getCancelType()), pageData, jgScrapCancelDto.getRecord(), jgScrapCancelDto.getSequenceNbr().toString());
         return jgScrapCancelDto;
     }
 
+    private String getRegistrationClass (String cancelType){
+        return "1".equals(cancelType) ? "报废注销" : "移装注销";
+    }
+
     private void executeOneStep(JgScrapCancelDto jgScrapCancelDto, String taskName, String nextUserIds, String operate) {
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgScrapCancelDto, operate);
@@ -520,47 +531,44 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return cmWorkflowService.completeOrReject(jgScrapCancelDto.getNextTaskId(), dto, op);
     }
 
+
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
-        // 安装告知信息
-        JgScrapCancel notice = this.baseMapper.selectById(sequenceNbr);
-        if (Objects.isNull(notice)) {
-            return null;
-        }
-        Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
-        installationInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
-        installationInfo.put("cancelCertificateList", JSON.parseArray(String.valueOf(installationInfo.get("cancelCertificate"))));
-        installationInfo.put("otherAccessories", JSON.parseArray(JSONObject.toJSONString(installationInfo.get("otherAccessories"))));
-        LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
-        lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr);
-        JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
-        if (!ValidationUtil.isNull(jgScrapCancelEq.getEquId()) && !"null".equals(jgScrapCancelEq.getEquId())) {
-            // 设备信息
-            installationInfo.put("record", jgScrapCancelEq.getEquId());
-
-            LambdaQueryWrapper<IdxBizJgRegisterInfo> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(IdxBizJgRegisterInfo::getRecord, jgScrapCancelEq.getEquId());
-            queryWrapper.last("limit 1");
-            IdxBizJgRegisterInfo one = idxBizJgRegisterInfoMapper.selectOne(queryWrapper);
-            installationInfo.put("equCode", one.getEquCode());
-            Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
-            String equList = String.valueOf(detailFieldCamelCaseByRecord.getOrDefault("equList", ""));
-            Map<String, Object> collect = Stream.concat(
-                            installationInfo.entrySet().stream(),
-                            detailFieldCamelCaseByRecord.entrySet().stream()
-                    )
-                    .filter(entry -> entry.getValue() != null)
-                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
-            collect.put("equList", equList);
-//            collect.put("EQU_LIST_CODE", equList);
-            return new HashMap<String, Object>() {{
-                this.put(PAGE_KEY, collect);
-            }};
+        Map<String, Object> resultMap = new HashMap<>();
+        JgScrapCancel scrapCancel = this.baseMapper.selectById(sequenceNbr);
+        Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true);
+        beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate()));
+        beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories()));
+        if(scrapCancel.getAuditStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
+            // 完成状态查询历史表
+            JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr);
+            // 兼容老业务
+            if(jsonObject == null){
+                // 老数据逻辑
+                fillRuntimeData(sequenceNbr, resultMap);
+            } else {
+                // 新数据逻辑
+                resultMap.putAll(jsonObject);
+            }
+            resultMap.putAll(beanMap);
+        } else {
+            // 其他状态显示实时数据
+            fillRuntimeData(sequenceNbr, resultMap);
+            resultMap.putAll(beanMap);
         }
+        resultMap.put("receiveOrgCode", scrapCancel.getReceiveCompanyCode() + '_' + scrapCancel.getReceiveOrgName());
         return new HashMap<String, Object>() {{
-            this.put(PAGE_KEY, installationInfo);
+            this.put(PAGE_KEY, resultMap);
         }};
     }
 
+    private void fillRuntimeData(Long sequenceNbr, Map<String, Object> resultMap) {
+        JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(new LambdaQueryWrapper<JgScrapCancelEq>().eq(JgScrapCancelEq::getEquipTransferId, sequenceNbr));
+        if (!ObjectUtils.isEmpty(jgScrapCancelEq)) {
+            Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgScrapCancelEq.getEquId());
+            resultMap.putAll(map);
+        }
+    }
+
 
     @Transactional
     public void revocation(String instanceId, String nextTaskId) {
@@ -569,7 +577,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
-            if(!isLocked){
+            if (!isLocked) {
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 流程执行时，状态及权限校验
@@ -609,7 +617,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
-            if(lock.isHeldByCurrentThread()){
+            if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
         }
@@ -634,7 +642,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         try {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             // 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
-            if(!isLocked){
+            if (!isLocked) {
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 流程执行时，状态及权限校验
@@ -665,7 +673,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
-            if(lock.isHeldByCurrentThread()){
+            if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
         }