更新

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

@@ -199,4 +199,7 @@ public class JgTransferNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "办理日期")
     private Date handleDate;
+
+    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/JgTransferNotice.java

@@ -283,6 +283,8 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("next_execute_ids")
     private String nextExecuteIds;
 
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
 
     @TableField("status")
     private String status;

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

@@ -54,7 +54,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL
             </if>
             <if test="type == 'enterprise'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
@@ -89,6 +89,7 @@
             tjtn.city_name AS cityName,
             tjtn.county_name AS countyName,
             tjtn.promoter AS promoter,
+            tjtn.equ_register_code AS equRegisterCode,
             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

@@ -179,9 +179,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             throw new IllegalArgumentException("参数不能为空");
         }
 
-        JgTransferNotice jgMaintainNotice = this.getById(sequenceNbr);
+        JgTransferNotice jgTransferNotice = this.getById(sequenceNbr);
         List<Map<String, Object>> informationList = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
-        if (Objects.isNull(jgMaintainNotice) || CollectionUtils.isEmpty(informationList)) {
+        if (Objects.isNull(jgTransferNotice) || CollectionUtils.isEmpty(informationList)) {
             throw new IllegalArgumentException("移装告知单不存在");
         }
         Map<String, Object> maintain = informationList.get(0);
@@ -195,18 +195,18 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("applyNo", getValue.apply("applyNo"));
         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("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", "");
+        placeholders.put("installType", "");
+        placeholders.put("installLicenseNo", "");
+        placeholders.put("installLicenseExpirationDate", "");
+        placeholders.put("installLeaderName", "");
+        placeholders.put("installLeaderPhone", "");
+        placeholders.put("installUnitAddress", "");
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
@@ -218,7 +218,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         // word转pdf
         File pdfFile;
         try {
-            pdfFile = this.wordToPdf("transfer-notification-report.ftl", placeholders);
+            pdfFile = this.wordToPdf("installation-notification-report.ftl", placeholders);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -234,8 +234,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
 
         // 更新到数据库
-//        jgMaintainNotice.setNoticeReportUrl(url);
-//        this.updateById(jgMaintainNotice);
+        jgTransferNotice.setNoticeReportUrl(url);
+        this.updateById(jgTransferNotice);
 
         return url;
     }
@@ -669,7 +669,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
             if("0".equals(op)) {
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-//                this.generateMaintainNoticeReport(JgTransferNotice.getSequenceNbr());
+                this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
             } else {
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 jgTransferNotice.setInstanceStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));