fix(JG)：使用标志套打

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

@@ -814,7 +814,7 @@ public class CommonServiceImpl implements ICommonService {
                 // 设置文本域的字体为中文字体
                 acroFields.setFieldProperty(param.getKey(), "textfont", font, null);
                 // 设置字体大小
-                acroFields.setFieldProperty(param.getKey(), "textsize", 12.0f, null);
+                acroFields.setFieldProperty(param.getKey(), "textsize", 9.0f, null);
                 // 将 map 中的值写到 pdf 模板对应的文本域中
                 acroFields.setField(param.getKey(), param.getValue() + "");
             }
@@ -1659,10 +1659,12 @@ public class CommonServiceImpl implements ICommonService {
         String printFileName = "套打使用登记标志.pdf";
 
         Map<String, Object> paramMap = Bean.BeantoMap(useFlagParamDto);
-        // 二维码设置
-        setQrCode(useFlagParamDto, paramMap);
+
         setNextDate(useFlagParamDto, paramMap);
         setRegName(useFlagParamDto, paramMap);
+        // 生成二维码,之前为设备监管码，调整为申请单号
+        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(useFlagParamDto.getApplyNo()).orElse(""), 100, 100);
+        paramMap.put("supervisoryCode", qrCode);
 
         this.fillParamValueToPdf(paramMap, response, selectPdfTemplate(useFlagParamDto.getEquListCode()), printFileName);
     }

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

@@ -1039,7 +1039,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
-        useFlagParamDto.setMaintenanceUnitName(idxBizJgMaintenanceRecordInfo.getMeUnitName());
+        useFlagParamDto.setMaintenanceUnitName(idxBizJgMaintenanceRecordInfo.getMeUnitName() == null ? "" : idxBizJgMaintenanceRecordInfo.getMeUnitName());
     }
 
     private String buildEmergencyTel(IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo) {