推送oa的记录用合并pdf

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/appointmentconfirmorder/vo/AppAppointmentRefuseVO.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.app.appointmentconfirmorder.vo;
 
+import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -12,6 +13,9 @@ public class AppAppointmentRefuseVO {
     @Schema(description = "id列表", required = true)
     private List<String> equipIds;
 
+    @Schema(description = "管线列表")
+    private List<EquipPipeDetailDO> detailEquipRows;
+
     @Schema(description = "订单id")
     private String orderId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/PipeAppointmentConfirmOrderServiceImpl.java

@@ -1249,6 +1249,7 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
     public void refuseCheckApp(AppAppointmentRefuseVO appointmentRefuseVO) {
         AppointmentRefuseVO refuseVO = new AppointmentRefuseVO();
         refuseVO.setEquipIds(appointmentRefuseVO.getEquipIds());
+        refuseVO.setDetailEquipRows(appointmentRefuseVO.getDetailEquipRows());
         refuseVO.setOrderId(appointmentRefuseVO.getOrderId());
         refuseVO.setOrderNo(appointmentRefuseVO.getOrderNo());
         refuseVO.setCheckType(appointmentRefuseVO.getCheckType());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -5554,9 +5554,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             taskOrderReportDOS.parallelStream().forEachOrdered(taskOrderReportDO -> {
                 try {
                     // 报告模板
-                    DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId("record_" + taskOrderReportDO.getId());
+                    DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId(taskOrderReportDO.getId());
                     if (insDO != null) {
-                        byte[] pdf = pdfService.pdf(taskOrderReportDO.getReportTemplateId(), insDO.getId());
+                        byte[] pdf = pdfService.pdf(taskOrderReportDO.getTemplateId(), insDO.getId());
                         mergerUtility.addSource(new ByteArrayInputStream(pdf));
                     }
                 } catch (Exception e) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3100,8 +3100,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         // 记录模板
         DynamicTbInsDO dynamicTbInsDO1 = dynamicTbInsService.getDynamicRefId(taskOrderItemReportDO.getId());
-//        byte[] pdf1 =  pdfService.pdf(dynamicTbInsDO1.getTbId(), dynamicTbInsDO1.getId());
-        byte[] pdf1 =getRecordOutputStreamMerge2(pipeTaskOrderDO.getId());
+        byte[] pdf1 =  pdfService.pdf(dynamicTbInsDO1.getTbId(), dynamicTbInsDO1.getId());
+//        byte[] pdf1 =getRecordOutputStreamMerge2(pipeTaskOrderDO.getId());
         // 报告模板
         byte[] pdf2 =getRecordOutputStreamMerge(pipeTaskOrderDO.getId());
 //        byte[] pdf2 = externalOAService.pdf(dynamicTbInsDO1.getTbId(), dynamicTbInsDO1.getId());
@@ -4869,9 +4869,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 try {
 
                     // 报告模板
-                    DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId("record_" + taskOrderReportDO.getId());
+                    DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId(taskOrderReportDO.getId());
                     if (insDO != null) {
-                        byte[] pdf = pdfService.pdf(taskOrderReportDO.getReportTemplateId(), insDO.getId());
+                        byte[] pdf = pdfService.pdf(taskOrderReportDO.getTemplateId(), insDO.getId());
                         mergerUtility.addSource(new ByteArrayInputStream(pdf));
                     }
                 } catch (Exception e) {