移装告知 和 安装告知 详情API修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -88,13 +88,13 @@
             tec1.name                       AS equList,
             tec.name                        AS equDefine,
 
-            isn.equ_register_code AS equRegisterCode,
+            if(isn.equ_register_code is null or isn.equ_register_code = 'null', '', isn.equ_register_code) AS equRegisterCode,
 
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS proDuctPhoto,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -120,12 +120,12 @@
             oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
-            ri.equ_code AS equRegisterCode,
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS proDuctPhoto,
+            ri.EQU_CODE AS equRegisterCode,
+            ri.PRODUCT_NAME AS productName,
+            ri.BRAND_NAME AS brandName,
+            ri.EQU_TYPE AS equType,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,

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

@@ -200,14 +200,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             if(installationInfo.containsKey(s)) {
                 installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(installationInfo.get(s).toString()));
             }
-            if(equipmentInfos.get(0).containsKey(s)) {
-                equipmentInfos.get(0).put(s, ObjectUtils.isEmpty(equipmentInfos.get(0).get(s)) ? new JSONArray() : parseArray(equipmentInfos.get(0).get(s).toString()));
-            }
         }
-        Map<String, Object> map = equipmentInfos.get(0);
-        BeanUtil.copyProperties(installationInfo, map, "equList", "supervisoryCode", "factoryNum");
+        Map<String, Object> detail = equipmentInfos.get(0);
+        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
         return new HashMap<String, Map<String, Object>>() {{
-            this.put("installationInfo", map);
+            this.put("installationInfo", detail);
         }};
     }
 

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

@@ -127,29 +127,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment", "powerOfAttorney", "constructionContract"};
         // 设备信息
-        QueryWrapper<JgTransferNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgTransferNoticeEq jgTransferNoticeEq = jgTransferNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgTransferNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgTransferNoticeEq.getEquId());
-        if (!ObjectUtils.isEmpty(inspectDetail)) {
-            detail.putAll(inspectDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDetail)) {
-            detail.putAll(useDetail);
-        }
-        if (!ObjectUtils.isEmpty(useDestail)) {
-            detail.putAll(useDestail);
-        }
-        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
-        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
-        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
-        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
-        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
-        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
-        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
+        List<Map<String, Object>> equipmentInfos = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
+
         for (String s : fields) {
             if (transferNotice.containsKey(s)) {
                 if ("powerOfAttorney".equalsIgnoreCase(s)) {
@@ -161,10 +140,19 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 }
             }
         }
+        Map<String, Object> detail = equipmentInfos.get(0);
+        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        detail.put("insUseMaintainExplain", JSON.parse(String.valueOf(detail.get("insUseMaintainExplain"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
+        detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
         BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
         return new HashMap<String, Map<String, Object>>() {{
             this.put("transferNoticeInfo", detail);
         }};
+
     }
 
     @Override