fix(JG)：告知书-告知书编号生成规则调整

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

@@ -441,4 +441,10 @@ public class JgInstallationNotice extends BaseEntity {
      */
     @TableField(value = "org_branch_name")
     private String orgBranchName;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

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

@@ -345,4 +345,10 @@ public class JgMaintainNotice extends BaseEntity {
      */
     @TableField(exist = false)
     private String fullAddress;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

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

@@ -345,4 +345,10 @@ public class JgReformNotice extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

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

@@ -326,4 +326,9 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
 
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
 }

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

@@ -454,7 +454,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -478,7 +478,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);
 
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
 //        String url = WordTemplateUtils.templateToPdf("installation-notification-report.ftl", placeholders);
@@ -830,8 +830,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord,jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getReceiveOrgCreditCode()).append(ym);
                 String equCode = stringBuffer.toString();
+
                 ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
                 String deviceRegistrationCode = responseModel.getResult();
                 Map<String, Object> map = new HashMap<>();
@@ -854,8 +855,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
                 }
                 tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
-                jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                //tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
+                //jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+                jgInstallationNotice.setInformNumber(deviceRegistrationCode);
+
                 jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
                 Map<String,Map<String,Object>> objMap = new HashMap<>();
                 map1.put("EQU_CODE",tzsJgRegistrationInfo.getEquCode() );

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

@@ -372,7 +372,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -395,7 +395,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         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);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
         placeholders.put("installLicenseNoList", installLicenseNoList);//许可证编号
         placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);//许可证有效期
@@ -768,7 +768,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getReceiveOrgCode()).append(ym);
+                String equCode = stringBuffer.toString();
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+                jgMaintainNotice.setInformNumber(deviceRegistrationCode);
+
                 jgMaintainNotice.setAcceptDate(new Date());
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());

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

@@ -353,7 +353,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -377,7 +377,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
 
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
@@ -753,7 +753,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgReformNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgReformNotice.getReceiveCompanyCode()).append(ym);
+                String equCode = stringBuffer.toString();
+
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+                jgReformNotice.setInformNumber(deviceRegistrationCode);
 
                 jgReformNotice.setAcceptDate(new Date());
                 jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));

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

@@ -226,7 +226,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         Map<String, Object> placeholders = new HashMap<>();
         placeholders.put("sequenceNbr", getValue.apply("sequenceNbr"));
         placeholders.put("installUnitName", getValue.apply("installUnitName"));
-        placeholders.put("applyNo", getValue.apply("applyNo"));
+        placeholders.put("informNumber", getValue.apply("informNumber"));
         placeholders.put("productName", getValue.apply("productName"));
         placeholders.put("equipType", getValue.apply("equType"));
         placeholders.put("equipCode", getValue.apply("equRegisterCode"));
@@ -246,7 +246,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
         placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
+        String qrCode = ImageUtils.generateQRCode(getValue.apply("informNumber"), 300, 300);
         placeholders.put("qrCode", qrCode);
 
         placeholders.put("installLicenseNoList", installLicenseNoList);
@@ -710,7 +710,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgTransferNoticeEq.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getCity()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgTransferNotice.getReceiveCompanyCode()).append(ym);
+                String equCode = stringBuffer.toString();
+                ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
+                String deviceRegistrationCode = responseModel.getResult();
+
+                jgTransferNotice.setInformNumber(deviceRegistrationCode);
+
                 jgTransferNotice.setPromoter("");
                 jgTransferNotice.setHandleDate(new Date());
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -308,7 +308,7 @@
                                 <w:u w:val="single"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t>${applyNo}</w:t>
+                            <w:t>${informNumber}</w:t>
                         </w:r>
                     </w:p>
                     <w:tbl>