fix(改造告知)：1.fixed 流程撤回或驳回再次提交后显示为“已通过”; 2. fixed 通过 & 驳回的时候意见没有传给工作流

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/JgReformNoticeServiceImpl.java

@@ -318,18 +318,22 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         placeholders.put("produceCode", getValue.apply("produceCode")); // TODO: 制造编号 - 设备出厂编号
         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("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") +
+                getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
         placeholders.put("installType", "改造告知"); // TODO: 施工类别
         placeholders.put("installLicenseNo", getValue.apply("installLicenseNo"));
         placeholders.put("installLicenseExpirationDate", getValue.apply("installLicenseExpirationDate"));
         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("installUnitAddress", getValue.apply("provinceName") + getValue.apply("cityName") +
+                getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address")); // TODO: 施工单位地址
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitAddress"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") +
+                getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
+
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
         placeholders.put("qrCode", qrCode);