移装变更登记，详情返回设备详情

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

@@ -455,6 +455,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr, String equipId) {
         Map<String, Map<String, Object>> pageDataMap = new HashMap<>();
         Map<String, Object> resultDataMap = new HashMap<>();
+        String record = "";
 
         //移装变更详情
         JgChangeRegistrationTransfer transferById = this.getById(sequenceNbr);
@@ -462,6 +463,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             Map<String, Object> transferToMap = Bean.BeantoMap(transferById);
             resultDataMap.putAll(transferToMap);
         }
+
         //判断流程是否执行完成，
         // 1、未执行完成时查询历史表
         // 2、执行完成后查询使用信息表
@@ -469,7 +471,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             JgRegistrationHistory historyData = jgRegistrationHistoryService.getDteailByRecord(equipId, transferById.getApplyNo());
             if (!ValidationUtil.isEmpty(historyData)) {
                 JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
-                String record = newPosition.getString("record");
+                record = newPosition.getString("record");
                 String receiveOrgCode = newPosition.getString("receiveOrgCode");
                 String equCode = newPosition.getString("equCode");
                 String province = newPosition.getString("province");
@@ -516,7 +518,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
             if (!ValidationUtil.isEmpty(useInfoByRecord)) {
                 Map<String, Object> useInfoToMap = Bean.BeantoMap(useInfoByRecord);
-                resultDataMap.put("record", useInfoByRecord.getRecord());
+                record = useInfoByRecord.getRecord();
+                resultDataMap.put("record", record);
                 resultDataMap.putAll(useInfoToMap);
                 // 省市区街道字段
                 resultDataMap.put("province", useInfoByRecord.getProvince() + "_" + useInfoByRecord.getProvinceName());
@@ -533,7 +536,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
             resultDataMap.put("receiveOrgCode", transferById.getReceiveOrgCode() + "_" + transferById.getReceiveOrgName());
         }
-
+        //查询设备详情
+        if(!ValidationUtil.isEmpty(record)){
+            Map<String, Object> equipDetailMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);
+            resultDataMap.putAll(equipDetailMap);
+        }
         if (!resultDataMap.isEmpty()) {
             pageDataMap.put(TABLE_PAGE_ID, resultDataMap);
         }