fix(改造告知)：新增报告PDF字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgReformNoticeDto.java

@@ -187,4 +187,6 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty(value = "发起人id用于撤回操作")
     private String promoter;
 
+    @ApiModelProperty(value = "告知单PDF URL")
+    private String noticeReportUrl;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -286,4 +286,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "promoter")
     private String promoter;
+
+    /**
+     * 告知单PDF URL
+     */
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
 }

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

@@ -328,17 +328,17 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
-        placeholders.put("produceCode", getValue.apply("produceCode")); // TODO: 制造编号
+        // 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("installStartDate", getValue.apply("installStartDate"));
-        placeholders.put("installType", getValue.apply("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("installUnitAddress")); // TODO: 施工单位地址
+        // placeholders.put("installStartDate", getValue.apply("installStartDate"));
+        // placeholders.put("installType", getValue.apply("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("installUnitAddress")); // TODO: 施工单位地址
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
@@ -366,7 +366,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
 
         // 更新到数据库
-        // JgReformNotice.setNoticeReportUrl(url);
+        JgReformNotice.setNoticeReportUrl(url);
         this.updateById(JgReformNotice);
 
         return url;
@@ -474,10 +474,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             if (!CollectionUtils.isEmpty(instanceIdList)) {
                 dto.setInstanceId(instanceIdList.get(i));
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
-            dto.setPromoter(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -667,7 +667,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         if (submit) {
             if ("0".equals(op)) {
                 JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
-                // this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
+                this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
                 // 更新其他业务表
                 // tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
                 // tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());