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

@@ -3271,9 +3271,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
         // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
+        // 流程中的新设备处理逻辑（历史有证已完成不执行、历史黑设备在使用登记编辑维保、安装信息，所以详情从json取）
         if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
                 || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
-                || "1".equals(jgUseRegistration.getRegType())) {
+                && !"2".equals(jgUseRegistration.getRegType())) {
             fillLastEquipDetail(jsonObject, record);
         }
     }
@@ -3282,16 +3283,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 基本信息 + 制造信息 + 设计信息
         fillLastEquipBaseInfo(jsonObject, record);
         // 安装信息
-        if (!jsonObject.containsKey("installationIsComplete")) {
-            Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
-            // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
-            if (ValidationUtil.isEmpty(installDetail)) {
-                installDetail = this.baseMapper.getiInstallDetailByIdx(record);
-            }
-            if (!ObjectUtils.isEmpty(installDetail)) {
-                jsonObject.putAll(installDetail);
-            }
+
+        Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
+        // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
+        if (ValidationUtil.isEmpty(installDetail)) {
+            installDetail = this.baseMapper.getiInstallDetailByIdx(record);
         }
+        if (!ObjectUtils.isEmpty(installDetail)) {
+            jsonObject.putAll(installDetail);
+        }
+
         // 维保信息
         Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
         // 历史设备登记来的数据没有维保业务信息 从一码通数据拿
@@ -4499,9 +4500,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     useInfo.setStreetName(useStreetName);
                     useInfo.setAddress(String.valueOf(map.get("address")));
                     useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
-                    Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(MapUtil.getStr(map, "estateUnitName"), TcmUnitTypeEnum.CQ.getCode());
-                    useInfo.setEstateUnitCreditCode(MapUtil.getStr(propertyUnitInfo, "unitCode"));
-                    useInfo.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "unitName"));
+                    if (!ValidationUtil.isEmpty(MapUtil.getStr(map, "estateUnitName")) && MapUtil.getStr(map, "estateUnitName").split("_").length == 2) {
+                        useInfo.setEstateUnitCreditCode(MapUtil.getStr(map, "estateUnitName").split("_")[0]);
+                        useInfo.setEstateUnitName(MapUtil.getStr(map, "estateUnitName").split("_")[1]);
+                    } else {
+                        Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(MapUtil.getStr(map, "estateUnitName"), TcmUnitTypeEnum.CQ.getCode());
+                        useInfo.setEstateUnitCreditCode(MapUtil.getStr(propertyUnitInfo, "unitCode"));
+                        useInfo.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "unitName"));
+                    }
                     useInfo.setPhone(String.valueOf(map.get("phone")));
                     useInfo.setSafetyManager(map.getString("safetyManagerName"));
                     useInfo.setSafetyManagerId(map.getString("safetyManagerId"));