修改：安装告知书设备地址取值错误（原值取了施工单位地址）

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

@@ -95,7 +95,7 @@
             tec1.name                       AS equList,
             tec.name                        AS equDefine,
 
-            if(isn.equ_register_code is null or isn.equ_register_code = 'null', '', isn.equ_register_code) AS equRegisterCode,
+            if(ri.EQU_CODE is null or ri.EQU_CODE = 'null', '', ri.EQU_CODE) AS equRegisterCode,
 
             ri.PRODUCT_NAME AS productName,
             ri.BRAND_NAME AS brandName,
@@ -124,24 +124,24 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ei.use_contact AS safetyManager,
             ei.contact_phone AS safetyManagerPhone,
-            ei.address AS address,
             ei.use_code AS useCode,
             isn.install_unit_credit_code AS installUnitCreditCode,
             idi.INSPECT_REPORT as inspectReport,
             ei.address as useUnitLeaderAddress,
-            re.equ_id as equId
+            re.equ_id as equId,
+            (select address from tz_base_enterprise_info where isn.install_unit_credit_code = use_unit_code) installUnitAddress
         FROM
             tzs_jg_installation_notice isn
-                LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-                LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
-                LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
-                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
-            LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
+        LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
+        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+        LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+        LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+        LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+        LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+        LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+        LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+        LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
             LIMIT 1

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

@@ -456,7 +456,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("produceCode", getValue.apply("factoryNum")); // TODO: 出厂编号
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
-        placeholders.put("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
+        placeholders.put("installUnitAddress", getValue.apply("installUnitAddress"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
         placeholders.put("installType", "安装告知"); // TODO: 施工类别
         placeholders.put("installLicenseNo", getValue.apply("installLicenseNo"));