改造告知、维修告知打印告知单中的设备地址修改

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

@@ -185,8 +185,11 @@
                fi.ins_use_maintain_explain                                                     AS insUseMaintainExplain,
                useUnit.use_contact                                                             AS safetyManager,
                useUnit.contact_phone                                                           AS safetyManagerPhone,
-               (select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)   AS useUnitCityName,
-               (select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCountyName,
+               (select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)   AS equipProvinceName,
+               (select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)   AS equipCityName,
+               (select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCountyName,
+               (select ui.STREET_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipStreetName,
+               (select ui.ADDRESS from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)     AS equipAddress,
                useUnit.ADDRESS                                                                 AS useUnitAddress,
                useUnit.ADDRESS                                                                 AS useUnitLeaderAddress,
                installUnit.use_code                                                            AS useCode,

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

@@ -146,6 +146,11 @@
                fi.factory_standard            AS factoryStandard,
                fi.product_quality_yield_prove AS productQualityYieldProve,
                fi.ins_use_maintain_explain    AS insUseMaintainExplain,
+                (select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)   AS equipProvinceName,
+                (select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)   AS equipCityName,
+                (select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCountyName,
+                (select ui.STREET_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipStreetName,
+                (select ui.ADDRESS from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id)     AS equipAddress,
                (select useUnit.use_contact from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS safetyManager,
                (select useUnit.contact_phone from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS safetyManagerPhone,
                (select useUnit.ADDRESS from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS useUnitLeaderAddress,

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

@@ -652,7 +652,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("installType", businessType); // 施工类别
         placeholders.put("installLeaderName", getValue.apply("installLeaderName"));
         placeholders.put("installLeaderPhone", getValue.apply("installLeaderPhone"));
-        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
+        placeholders.put("fullAddress", getValue.apply("equipProvinceName") + getValue.apply("equipCityName") + getValue.apply("equipCountyName") + getValue.apply("equipStreetName") + getValue.apply("equipAddress"));
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));