Commit 26c7d7da authored by 韩桐桐's avatar 韩桐桐

fix(jg):压力管道安装告知书样式调整

parent ecda5452
...@@ -660,10 +660,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -660,10 +660,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 组装模板变量 // 组装模板变量
Map<String, Object> placeholders = new HashMap<>(); Map<String, Object> placeholders = new HashMap<>();
placeholders.put("doMain", TZSDOMAIN); placeholders.put("doMain", TZSDOMAIN);
placeholders.put("equList", getValue.apply("equList"));
placeholders.put("installUnitName", getValue.apply("installUnitName")); placeholders.put("installUnitName", getValue.apply("installUnitName"));
placeholders.put("informNumber", getValue.apply("informNumber")); placeholders.put("informNumber", getValue.apply("informNumber"));
placeholders.put("productName", getValue.apply("productName")); placeholders.put("productName", getValue.apply("productName"));
placeholders.put("equipType", getValue.apply("equType"));
placeholders.put("equipCode", getValue.apply("equRegisterCode")); placeholders.put("equipCode", getValue.apply("equRegisterCode"));
placeholders.put("produceCode", getValue.apply("factoryNum")); // 出厂编号 placeholders.put("produceCode", getValue.apply("factoryNum")); // 出厂编号
placeholders.put("produceUnitName", getValue.apply("produceUnitName")); placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
...@@ -678,6 +678,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -678,6 +678,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
placeholders.put("useUnitLeaderName", getValue.apply("safetyManager")); placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone")); placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress")); placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
if ("压力管道".equals(getValue.apply("equList"))) {
ArrayList<String> equipTypeList = new ArrayList<>();// todo
equipTypeList.add("123123");
placeholders.put("equipTypeList", equipTypeList);
} else {
placeholders.put("equipType", getValue.apply("equType"));
}
// 安装单位许可信息 // 安装单位许可信息
placeholders.put("installLicenseNoList", installLicenseNoList); placeholders.put("installLicenseNoList", installLicenseNoList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment