报表调整

build-uat/update.sql

@@ -1553,4 +1553,11 @@ INSERT INTO "INFRA_CONFIG" ("ID","CATEGORY","TYPE","NAME","CONFIG_KEY","VALUE","
 -- 已加
 
 ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ISSUE_REPORT" ADD COLUMN "EQUIP_ID" VARCHAR(64);
-COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ISSUE_REPORT"."EQUIP_ID" IS '设备ID';
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ISSUE_REPORT"."EQUIP_ID" IS '设备ID';
+
+--20260604
+alter table PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT add QR_CODE_URL VARCHAR(128);
+comment on column PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT.QR_CODE_URL is '主报告二维码地址';
+
+alter table PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT add QR_CODE_URL VARCHAR(128);
+comment on column PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT.QR_CODE_URL is '主报告二维码地址';

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorderitemreport/BoilerTaskOrderItemReportDO.java

@@ -376,4 +376,6 @@ public class BoilerTaskOrderItemReportDO extends BaseDO {
     private LocalDateTime finishUploadTime;
 
     private LocalDate confirmationTime;
+
+    private String qrCodeUrl;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderitemreport/PipeTaskOrderItemReportDO.java

@@ -372,4 +372,6 @@ public class PipeTaskOrderItemReportDO extends BaseDO {
     private LocalDateTime finishUploadTime;
 
     private LocalDate confirmationTime;
+
+    private String qrCodeUrl;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -38,6 +38,8 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderinput.vo.PipeTaskOrderInputPrintReqVO;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordRespVO;
 import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
 import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerconnecttbservice.BoilerConnectTbServiceDO;
@@ -86,6 +88,7 @@ import cn.start.tz.module.pressure2.service.membermessage.MemberMessageRemoteSer
 import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
+import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
 import cn.start.tz.module.pressure2.util.vo.ReportRequest;
@@ -249,6 +252,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private BoilerTaskOrderUserMapper boilerTaskOrderUserMapper;
 
+    @Resource
+    private TaskOrderNonTaxRecordService taskOrderNonTaxRecordService;
+
     @Resource
     private PdfService pdfService;
 
@@ -971,8 +977,8 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 qrCodeValuesDTO.setPageno("1");
                 qrCodeValuesDTO.setWidth(71);
                 qrCodeValuesDTO.setHeight(71);
-                qrCodeValuesDTO.setX("441");
-                qrCodeValuesDTO.setY("568");
+                qrCodeValuesDTO.setX("310");
+                qrCodeValuesDTO.setY("630");
 
                 resultByte = this.sign(pdf, valuesDTOList, qrCodeValuesDTO);
                 log.info("签章成功");
@@ -2105,6 +2111,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage1) && CollUtil.isNotEmpty(taskOrderSignFilePage1.getList())) {
                 List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage1.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
                 if (CollUtil.isNotEmpty(list)) {
+                    //List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage1.getList();
                     BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
                     taskListFile.setCountNum(list.size());
                     taskListFile.setFileType(0);
@@ -2194,17 +2201,18 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
             }
 
             //非税缴费单
-//            TaskOrderNonTaxRecordPageReqVO pageReqVO = new TaskOrderNonTaxRecordPageReqVO();
-//            pageReqVO.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-//            PageResult<TaskOrderNonTaxRecordRespVO> taskOrderNonTaxRecordPage = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPage(pageReqVO);
-//            if (ObjectUtil.isNotEmpty(taskOrderNonTaxRecordPage) && CollUtil.isNotEmpty(taskOrderNonTaxRecordPage.getList())) {
-//                TaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new TaskOrderArchiveDetailRespVO.TaskListFile();
-//                taskListFile.setCountNum(taskOrderNonTaxRecordPage.getList().size());
-//                taskListFile.setFileType(3);
-//                taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-//                taskListFiles.add(taskListFile);
-//            }
-//            taskOrderArchiveDetail.setTaskListFiles(taskListFiles);
+            TaskOrderNonTaxRecordPageReqVO pageReqVO = new TaskOrderNonTaxRecordPageReqVO();
+            pageReqVO.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
+            PageResult<TaskOrderNonTaxRecordRespVO> taskOrderNonTaxRecordPage = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPage(pageReqVO);
+            if (ObjectUtil.isNotEmpty(taskOrderNonTaxRecordPage) && CollUtil.isNotEmpty(taskOrderNonTaxRecordPage.getList())) {
+                BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
+                taskListFile.setCountNum(taskOrderNonTaxRecordPage.getList().size());
+                taskListFile.setFileType(3);
+                taskListFile.setCompletionTime(taskOrderDO.getNoTaxPayTime()); //非税支付时间
+                taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
+                taskListFiles.add(taskListFile);
+            }
+            taskOrderArchiveDetail.setTaskListFiles(taskListFiles);
 
             //获取检验项目
             List<BoilerTaskOrderItemReportDO> list = taskOrderItemReportDOS.stream().filter(x -> Arrays.asList(100, 200, 300, 400, 900).contains(x.getReportType())).toList();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -838,7 +838,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             }
             byte[] qrCodeBytes = QRCodeUtil.generateQRCodeToBytes(url);
             String file = fileApi.createFile(taskOrderItemReportDO.getOrderItemId() + ".png", null, qrCodeBytes);
-//            updateObj.setQrCodeUrl(file);
+            updateObj.setQrCodeUrl(file);
         }
 
         taskOrderItemReportMapper.updateById(updateObj);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10023_202400ReportOFData.java

@@ -84,6 +84,8 @@ public class QC10023_202400ReportOFData implements IDynamicOFData {
             //根据记录字段动态生成报告字段
             result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(),ruleVO.getTemplateId(),refId);
             result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+            //主报告二维码
+            result.put("qrCode",itemReportDO.getQrCodeUrl());
             //检验员信息
             List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
             if (!checkUserList.isEmpty()){
@@ -98,47 +100,6 @@ public class QC10023_202400ReportOFData implements IDynamicOFData {
                 }
             }
 
-           /* result.put("reportNo",itemReportDO.getReportNo());
-
-            //编制人员信息
-            AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getPrepareId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("prepareName",userInfo.getSignUrl());
-                }else{
-                    result.put("prepareName",itemReportDO.getPrepareName());
-                }
-            }
-            if (itemReportDO.getPrepareTime() != null){
-                result.put("prepareTime",itemReportDO.getPrepareTime().format(dateFormat));
-            }
-
-            //审核人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getApprovalId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("approvalName",userInfo.getSignUrl());
-                }else{
-                    result.put("approvalName",itemReportDO.getApprovalName());
-                }
-            }
-            if (itemReportDO.getApprovalTime() != null){
-                result.put("approvalTime",itemReportDO.getApprovalTime().format(dateFormat));
-            }
-
-            //批准人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getRatifyId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("ratifyName",userInfo.getSignUrl());
-                }else{
-                    result.put("ratifyName",itemReportDO.getRatifyName());
-                }
-            }
-            if (itemReportDO.getRatifyTime() != null){
-                result.put("ratifyTime",itemReportDO.getRatifyTime().format(dateFormat));
-            }
-        */
         }
 
         return result;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -89,55 +89,9 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("useUnitName",equipBoilerDO.getUnitName());
-                result.put("contactPhone",equipBoilerDO.getContactPhone());
-                result.put("buringType",equipBoilerDO.getBuringType());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-                result.put("ratedPressure",equipBoilerDO.getRatedPressure());
-                result.put("unitInternalCode",equipBoilerDO.getUnitInternalCode());
-                if (equipBoilerDO.getMadeTime() != null){
-                    result.put("madeTime",equipBoilerDO.getMadeTime().format(dateFormat));
-                }
-                result.put("productCode",equipBoilerDO.getProductCode());
-                result.put("equipCode",equipBoilerDO.getEquipCode());
-                result.put("makeUnit",equipBoilerDO.getMakeUnit());
-                if (equipBoilerDO.getNextInCheckDate() != null){
-                    result.put("nextInCheckDate",equipBoilerDO.getNextInCheckDate().format(dateFormat));
-                    result.put("nextInCheckDate1", equipBoilerDO.getNextInCheckDate()
-                            .plusYears(1)
-                            .minusDays(1)
-                            .format(dateFormat));
-                }
-                result.put("unitCode",equipBoilerDO.getUnitCode());
-                if (equipBoilerDO.getNextPressureCheckDate() != null){
-                    result.put("nextPressureCheckDate",equipBoilerDO.getNextPressureCheckDate().format(dateFormat));
-                    result.put("nextPressureCheckDate1", equipBoilerDO.getNextPressureCheckDate()
-                            .plusYears(1)
-                            .minusDays(1)
-                            .format(dateFormat));
-                }
-                result.put("installUnit",equipBoilerDO.getInstallUnit());
-                result.put("designWorkPressure",equipBoilerDO.getDesignWorkPressure());
-                result.put("unitAddress",equipBoilerDO.getUnitAddress());
-                result.put("useRegisterNo",equipBoilerDO.getUseRegisterNo());
-                result.put("lastRepairReformContent",equipBoilerDO.getLastRepairReformContent());
-                result.put("ratedExportTemperature",equipBoilerDO.getRatedExportTemperature());
-                result.put("useOutletTemperature",equipBoilerDO.getUseOutletTemperature());
-                result.put("unitName",equipBoilerDO.getUnitName());
-                result.put("zipCode",equipBoilerDO.getZipCode());
-                result.put("buringMethod",equipBoilerDO.getBuringMethod());
-                result.put("ratedOutput",equipBoilerDO.getRatedOutput());
-                if (equipBoilerDO.getNextOutCheckDate() != null){
-                    result.put("nextOutCheckDate",equipBoilerDO.getNextOutCheckDate().format(dateFormat));
-                    result.put("nextOutCheckDate1", equipBoilerDO.getNextOutCheckDate()
-                            .plusYears(1)
-                            .minusDays(1)
-                            .format(dateFormat));
-                }
-                result.put("contact",equipBoilerDO.getContact());
-                if (equipBoilerDO.getUseTime() != null){
-                    result.put("useTime",(equipBoilerDO.getUseTime()).format(dateFormat));
-                }
+                result.put("workPressure",equipBoilerDO.getWorkpressure());
+                result.put("workTemperature",equipBoilerDO.getOilEquipBackTemp());
+                result.put("testMedium",equipBoilerDO.getTestmedium());
             }
 
             String orderId = itemReportDO.getOrderId();
@@ -150,6 +104,9 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
                 result.put("checkDateEnd",checkDateStr);
             }
 
+            //主报告二维码
+            result.put("qrCode",itemReportDO.getQrCodeUrl());
+
             result.put("reportNo",itemReportDO.getReportNo());
 
             //检验员信息

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10098_202400RecordOFData.java

@@ -78,6 +78,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
                 if (firstInsDO == null) {
                     result.put("other"," - ");
+                    result.put("refluxTemperature",equipBoilerDO.getOilEquipBackTemp());
                 }
 
                 //设备信息
@@ -85,6 +86,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("contactPhone",equipBoilerDO.getContactPhone());
                 result.put("buringType",equipBoilerDO.getBuringType());
                 result.put("boilerModel",equipBoilerDO.getBoilerModel());
+                result.put("boilerAddress",equipBoilerDO.getBoilerAddress());
                 result.put("ratedPressure",equipBoilerDO.getRatedPressure());
                 result.put("unitInternalCode",equipBoilerDO.getUnitInternalCode());
                 if (equipBoilerDO.getMadeTime() != null){
@@ -95,7 +97,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("makeUnit",equipBoilerDO.getMakeUnit());
                 result.put("installUnit",equipBoilerDO.getInstallUnit());
                 result.put("unitCode",equipBoilerDO.getUnitCode());
-                result.put("designWorkPressure",equipBoilerDO.getDesignWorkPressure());
+                result.put("workPressure",equipBoilerDO.getWorkpressure());
                 result.put("unitAddress",equipBoilerDO.getUnitAddress());
                 result.put("useRegisterNo",equipBoilerDO.getUseRegisterNo());
                 result.put("lastRepairReformContent",equipBoilerDO.getLastRepairReformContent());
@@ -103,7 +105,6 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 result.put("useOutletTemperature",equipBoilerDO.getUseOutletTemperature());
                 result.put("unitName",equipBoilerDO.getUnitName());
                 result.put("zipCode",equipBoilerDO.getZipCode());
-                //result.put("refluxTemperature",equipBoilerDO.getrefl());
                 result.put("buringMethod",equipBoilerDO.getBuringMethod());
                 result.put("ratedOutput",equipBoilerDO.getRatedOutput());
                 //上次内检日期

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -25,6 +25,8 @@ import cn.start.tz.module.member.api.user.dto.MemberUserRespDTO;
 import cn.start.tz.module.member.api.user.dto.SendAppMpMessageReqDTO;
 import cn.start.tz.module.member.api.user.dto.WxMpTemplateDataReqDto;
 import cn.start.tz.module.pressure2.constant.TemplateIdConstants;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordRespVO;
 import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
 import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
@@ -32,7 +34,6 @@ import cn.start.tz.module.pressure2.dal.mysql.orderreport.OrderReportMapper;
 import cn.start.tz.module.pressure2.enums.EnvConstants;
 import cn.start.tz.module.pressure2.enums.TaskOrderItemReportTypeEnum;
 import cn.start.tz.module.pressure2.enums.TaskOrderStatusEnum;
-import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderArchiveDetailRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.BoilerTaskOrderSignFilePageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.BoilerTaskOrderSignFileRespVO;
@@ -89,6 +90,7 @@ import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportrecord.PipeTaskOrderItemReportRecordService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportversion.PipeTaskOrderItemReportVersionService;
 import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
+import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
 import cn.start.tz.module.pressure2.util.vo.ReportRequest;
@@ -216,6 +218,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private ReportTemplateMapper reportTemplateMapper;
 
+    @Resource
+    private TaskOrderNonTaxRecordService taskOrderNonTaxRecordService;
+
     @Resource
     private BoilerTaskOrderSignFileService taskOrderSignFileService;
 
@@ -929,8 +934,8 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 qrCodeValuesDTO.setPageno("1");
                 qrCodeValuesDTO.setWidth(71);
                 qrCodeValuesDTO.setHeight(71);
-                qrCodeValuesDTO.setX("441");
-                qrCodeValuesDTO.setY("568");
+                qrCodeValuesDTO.setX("310");
+                qrCodeValuesDTO.setY("630");
 
                 resultByte = this.sign(pdf, valuesDTOList, qrCodeValuesDTO);
                 log.info("签章成功");
@@ -2075,7 +2080,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         List<PipeTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(queryWrapper);
         if (CollUtil.isNotEmpty(taskOrderItemReportDOS)) {
             //任务单相关文件
-            List<BoilerTaskOrderArchiveDetailRespVO.TaskListFile> taskListFiles = new ArrayList<>();
+            List<PipeTaskOrderArchiveDetailRespVO.TaskListFile> taskListFiles = new ArrayList<>();
 
             //安全检查记录
             BoilerTaskOrderSignFilePageReqVO pageReqVO1 = new BoilerTaskOrderSignFilePageReqVO();
@@ -2085,7 +2090,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage1) && CollUtil.isNotEmpty(taskOrderSignFilePage1.getList())) {
                 List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage1.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
                 if (CollUtil.isNotEmpty(list)) {
-                    BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
+                    PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
                     taskListFile.setCountNum(list.size());
                     taskListFile.setFileType(0);
                     taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
@@ -2109,7 +2114,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage2) && CollUtil.isNotEmpty(taskOrderSignFilePage2.getList())) {
                 List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage2.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
                 if (CollUtil.isNotEmpty(list)) {
-                    BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
+                    PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
                     taskListFile.setCountNum(list.size());
                     taskListFile.setFileType(1);
                     taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
@@ -2129,7 +2134,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage3) && CollUtil.isNotEmpty(taskOrderSignFilePage3.getList())) {
                 List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage3.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
                 if (CollUtil.isNotEmpty(list)) {
-                    BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
+                    PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
                     taskListFile.setCountNum(list.size());
                     taskListFile.setFileType(2);
                     taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
@@ -2150,7 +2155,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage4) && CollUtil.isNotEmpty(taskOrderSignFilePage4.getList())) {
                 List<BoilerTaskOrderSignFileRespVO> list = taskOrderSignFilePage4.getList().stream().filter(x -> StringUtils.isNotEmpty(x.getSignFilePdf())).toList();
                 if (CollUtil.isNotEmpty(list)) {
-                    BoilerTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new BoilerTaskOrderArchiveDetailRespVO.TaskListFile();
+                    PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
                     taskListFile.setCountNum(list.size());
                     taskListFile.setFileType(4);
                     taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
@@ -2174,17 +2179,17 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             }
 
             //非税缴费单
-//            TaskOrderNonTaxRecordPageReqVO pageReqVO = new TaskOrderNonTaxRecordPageReqVO();
-//            pageReqVO.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-//            PageResult<TaskOrderNonTaxRecordRespVO> taskOrderNonTaxRecordPage = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPage(pageReqVO);
-//            if (ObjectUtil.isNotEmpty(taskOrderNonTaxRecordPage) && CollUtil.isNotEmpty(taskOrderNonTaxRecordPage.getList())) {
-//                TaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new TaskOrderArchiveDetailRespVO.TaskListFile();
-//                taskListFile.setCountNum(taskOrderNonTaxRecordPage.getList().size());
-//                taskListFile.setFileType(3);
-//                taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-//                taskListFiles.add(taskListFile);
-//            }
-//            taskOrderArchiveDetail.setTaskListFiles(taskListFiles);
+            TaskOrderNonTaxRecordPageReqVO pageReqVO = new TaskOrderNonTaxRecordPageReqVO();
+            pageReqVO.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
+            PageResult<TaskOrderNonTaxRecordRespVO> taskOrderNonTaxRecordPage = taskOrderNonTaxRecordService.getTaskOrderNonTaxRecordPage(pageReqVO);
+            if (ObjectUtil.isNotEmpty(taskOrderNonTaxRecordPage) && CollUtil.isNotEmpty(taskOrderNonTaxRecordPage.getList())) {
+                PipeTaskOrderArchiveDetailRespVO.TaskListFile taskListFile = new PipeTaskOrderArchiveDetailRespVO.TaskListFile();
+                taskListFile.setCountNum(taskOrderNonTaxRecordPage.getList().size());
+                taskListFile.setFileType(3);
+                taskListFile.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
+                taskListFiles.add(taskListFile);
+            }
+            taskOrderArchiveDetail.setTaskListFiles(taskListFiles);
 
             //获取检验项目
             List<PipeTaskOrderItemReportDO> list = taskOrderItemReportDOS.stream().filter(x -> Arrays.asList(100, 200, 300, 400, 900).contains(x.getReportType())).toList();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -737,7 +737,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             }
             byte[] qrCodeBytes = QRCodeUtil.generateQRCodeToBytes(url);
             String file = fileApi.createFile(taskOrderItemReportDO.getOrderItemId() + ".png", null, qrCodeBytes);
-//            updateObj.setQrCodeUrl(file);
+            updateObj.setQrCodeUrl(file);
         }
 
         taskOrderItemReportMapper.updateById(updateObj);