更新

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

@@ -71,8 +71,8 @@
             tjtn.install_unit_name AS installUnitName,
             tjtn.apply_no AS applyNo,
             tjtn.province,
-            tjtn.city AS cityName,
-            tjtn.county AS countyName,
+            tjtn.city,
+            tjtn.county,
             tjtn.address AS address,
             tjtn.use_unit_name AS useUnitName,
             tjtn.install_unit_credit_code AS installUnitCreditCode,
@@ -91,6 +91,9 @@
             tjtn.county_name AS countyName,
             tjtn.promoter AS promoter,
             tjtn.equ_register_code AS equRegisterCode,
+            tjtn.plan_date AS installStartDate,
+            tjtn.construction_manager AS installLeaderName,
+            tjtn.construction_manager_phone AS installLeaderPhone,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,

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

@@ -205,13 +205,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
         placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address"));
-        placeholders.put("installStartDate", "");
-        placeholders.put("installType", "");
+        placeholders.put("installStartDate", getValue.apply("installStartDate"));
+        placeholders.put("installType", "移装"); // TODO: 施工类别
         placeholders.put("installLicenseNo", "");
         placeholders.put("installLicenseExpirationDate", "");
-        placeholders.put("installLeaderName", "");
-        placeholders.put("installLeaderPhone", "");
-        placeholders.put("installUnitAddress", "");
+        placeholders.put("installLeaderName", getValue.apply("installLeaderName"));// 施工负责人
+        placeholders.put("installLeaderPhone", getValue.apply("installLeaderPhone"));// 施工负责人手机
+        placeholders.put("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address")); // TODO: 施工单位地址
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));