合并记录pdf

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

@@ -3113,8 +3113,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());
@@ -3148,7 +3148,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         externalOACreateFlowReq.setThirdAttachments(thirdAttachments);
         String approvalId = updateObj.getApprovalId();
         AdminUserRespDTO checkedData = adminUserApi.getUser(approvalId).getCheckedData();
-        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,checkedData.getUsername());
+//        return externalOAService.createExternalOAFlow(externalOACreateFlowReq,checkedData.getUsername());
+        return null;
     }