fix(jg): 修改地址取值

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

@@ -51,10 +51,9 @@
             isn.sequence_nbr AS sequenceNbr,
             isn.install_unit_name AS installUnitName,
             isn.apply_no AS applyNo,
-            isn.province AS province,
-            isn.city AS city,
-            isn.county AS county,
-            isn.street AS street,
+            isn.province_name AS provinceName,
+            isn.city_name AS cityName,
+            isn.county_name AS countyName,
             isn.address AS address,
             isn.install_start_date AS installStartDate,
             isn.install_license_no AS installLicenseNo,

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

@@ -265,7 +265,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("produceCode", getValue.apply("produceCode")); // TODO: 制造编号
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
-        placeholders.put("fullAddress", getValue.apply("province") + getValue.apply("city") + getValue.apply("county") + getValue.apply("street") + getValue.apply("address"));
+        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
         placeholders.put("installType", getValue.apply("installType")); // TODO: 施工类别
         placeholders.put("installLicenseNo", getValue.apply("installLicenseNo"));