1.修改码的取值为申请单号唯一

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

@@ -606,8 +606,8 @@ public class CommonServiceImpl implements ICommonService {
         map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString());  // 发证日期-日
         map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString());  // 发证日期-日
         map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString());  // 发证日期-日
-        // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 100, 100);
+        // 生成二维码,之前为设备监管码，调整为申请单号
+        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("applyNo")).orElse("").toString(), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码
 
         // word转pdf
@@ -665,8 +665,8 @@ public class CommonServiceImpl implements ICommonService {
         Arrays.stream(DEFAULT_KEYS)
                 .forEach(key -> map.computeIfAbsent(key, k -> ""));
 
-        // 生成二维码
-        String qrCode = ImageUtils.generateQRCode((String) map.getOrDefault("supervisoryCode", ""), 100, 100);
+        // 生成二维码,之前为设备监管码，调整为申请单号
+        String qrCode = ImageUtils.generateQRCode((String) map.getOrDefault("applyNo", ""), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码 代码优化
 
         // 读取资源文件夹下的模板

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

@@ -789,6 +789,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
+        exportParamsMap.put("applyNo", jgChangeRegistrationReform.getApplyNo());
         if ("0".equals(printType)) {
             //调用生成使用登记证
             commonServiceImpl.generateCertificateReport(exportParamsMap, response);

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

@@ -1139,6 +1139,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
+        exportParamsMap.put("applyNo", transfer.getApplyNo());
         if ("0".equals(printType)) {
             //调用生成使用登记证
             commonService.generateCertificateReport(exportParamsMap, response);

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

@@ -977,7 +977,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         //调用生成使用登记证
         exportParamsMap.put("excelType","变更登记");
         exportParamsMap.put("tableName","特种设备单位变更登记");
-
+        exportParamsMap.put("applyNo", transfer.getApplyNo());
         if ("0".equals(printType)) {
             //调用生成使用登记证
             commonService.generateCertificateReport(exportParamsMap, response);

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

@@ -751,7 +751,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             exportParamsMap.put("fullAddress", fullAddress);
         }
-
         IdxBizJgFactoryInfo factoryInfo = idxBizJgFactoryInfoService.getOneData(useRegistrationEq.getEquId());
         //产品编号(出厂编号)
         if (!ValidationUtil.isEmpty(factoryInfo)) {
@@ -760,6 +759,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
+        exportParamsMap.put("applyNo", useRegistration.getApplyNo());
         if ("0".equals(printType)) {
             //调用生成使用登记证
             commonService.generateCertificateReport(exportParamsMap, response);