缴费通知书中的缴费二维码

build-uat/update.sql

@@ -1494,4 +1494,8 @@ COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."CHECK_TYPE_NAME" IS '检验类
 COMMENT ON COLUMN "PRESSURE2_REPORT_CITY_RECORD"."EQUIP_STATUS_NAME" IS '运行状态文本';
 
 
+-- 0522以上已加
+
+--20260525
+ALTER TABLE "PRESSURE2_TASK_ORDER_NON_TAX_REPORT" ADD COLUMN "QRCODE_PATH" VARCHAR(32);
+COMMENT ON COLUMN "PRESSURE2_TASK_ORDER_NON_TAX_REPORT"."CHECK_TYPE_NAME" IS '二维码路径';

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/taskordernontaxreport/TaskOrderNonTaxReportDO.java

@@ -45,4 +45,7 @@ public class TaskOrderNonTaxReportDO extends BaseDO {
     private Integer equipMainType;
 
     private String insId;
+
+    private String qrcodePath;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/FSJFTZSOFData.java

@@ -91,6 +91,10 @@ public class FSJFTZSOFData implements IDynamicOFData {
                 result.put("ZSDWMC", unitName);
                 result.put("ZSDWBM", unitCode);
 
+                if (taskOrderNonTaxReportDO.getQrcodePath() != null){
+                    result.put("qrCode", taskOrderNonTaxReportDO.getQrcodePath());
+                }
+
                 String paymentInstructionNo = taskOrderNonTaxRecordDO.getPaymentInstructionNo();
                 DecimalFormat decimalFormat = new DecimalFormat("#.00");
                 String HMJYM = CheckCode.getNumVerCode(unitCode, paymentInstructionNo); //号码校验码

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordServiceImpl.java

@@ -559,11 +559,19 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
         if (reportDO != null && reportDO.getInsId() != null){
             instanceId = reportDO.getInsId();
         }else{
+
             reportDO = new TaskOrderNonTaxReportDO();
             reportDO.setNonTaxRecordId(taskOrderNonTaxRecordDO.getId());
             reportDO.setTemplateId(dynamicTbDO.getId());
             reportDO.setReportName(dynamicTbDO.getTbName());
             reportDO.setEquipMainType(taskOrderNonTaxRecordDO.getEquipMainType());
+            //支付二维码
+            String qrcode = getNonTaxPaymentUrl(id);
+            if (StringUtils.isNotBlank(qrcode)) {
+                ByteArrayOutputStream byteArrayOutputStream = ImageUtils.generateQRCode(qrcode, 80, 80);
+                String qrCodePath = fileApi.createFile(byteArrayOutputStream.toByteArray());
+                reportDO.setQrcodePath(qrCodePath);
+            }
             taskOrderNonTaxReportMapper.insert(reportDO);
 
             //生成报表
@@ -592,11 +600,6 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
         }
 
         byte[] bytes = pdfService.pdf(dynamicTbDO.getId(), instanceId);
-        //TODO 支付二维码
-//        String qrcode = getNonTaxPaymentUrl(id);
-//        if (StringUtils.isNotBlank(qrcode)) {
-//            ByteArrayOutputStream byteArrayOutputStream = ImageUtils.generateQRCode(qrcode, 80, 80);
-//        }
 
         // 添加盖章功能
         if(EnvConstants.ENV_UAT.equals(env) || EnvConstants.ENV_PROD.equals(env)){