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

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

@@ -94,7 +94,7 @@
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
             ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.product_photo AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -119,7 +119,8 @@
             ei.legal_phone AS safetyManagerPhone,
             ei.address AS address,
             ei.use_code AS useCode,
-            isn.install_unit_credit_code AS installUnitCreditCode
+            isn.install_unit_credit_code AS installUnitCreditCode,
+            idi.INSPECT_REPORT as inspectReport
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr

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

@@ -125,7 +125,7 @@
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
             ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            ri.product_photo AS proDuctPhoto,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -152,7 +152,8 @@
             ui.CITY_NAME AS useUnitCityName,
             ui.COUNTY_NAME AS useUnitCountyName,
             ui.ADDRESS AS useUnitAddress,
-            eio.use_code AS useCode
+            eio.use_code AS useCode,
+            idi.INSPECT_REPORT as inspectReport
         FROM
             tzs_jg_transfer_notice tjtn
                 LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr

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

@@ -194,42 +194,20 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment"};
-
         // 设备信息
-//        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
-
+        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s:fields) {
             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()));
             }
-        QueryWrapper<JgInstallationNoticeEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgInstallationNoticeEq::getEquipTransferId, notice.getSequenceNbr());
-        JgInstallationNoticeEq jgInstallationNoticeEq = jgInstallationNoticeEqMapper.selectOne(wrapper);
-        Map<String, Object> detail = jgUseRegistrationMapper.getDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDetail = jgUseRegistrationMapper.getUseDetail(jgInstallationNoticeEq.getEquId());
-        Map<String, Object> useDestail = jgUseRegistrationMapper.getDesDetail(jgInstallationNoticeEq.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"))));
-
-        BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum");
+        Map<String, Object> map = equipmentInfos.get(0);
+        BeanUtil.copyProperties(installationInfo, map, "equList", "supervisoryCode", "factoryNum");
         return new HashMap<String, Map<String, Object>>() {{
-            this.put("installationInfo", detail);
+            this.put("installationInfo", map);
         }};
     }