OA审核通过报告重新覆盖生成

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

@@ -6401,7 +6401,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             taskOrderReportDOS.parallelStream().forEachOrdered(taskOrderReportDO -> {
                 try {
                     // 报告模板
-                    if (taskOrderReportDO.getIssueUrl() == null){
+                    if (taskOrderReportDO.getIssueUrl() == null || isCover){
                         DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId("report_" + taskOrderReportDO.getId());
                         if (insDO != null) {
                             byte[] pdf = pdfService.pdf(taskOrderReportDO.getReportTemplateId(), insDO.getId());
@@ -6437,7 +6437,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             mergeOutputStream.close();
 
             //如果报告办结且没有保存办结报告PDF则生成
-            if (taskOrderItemDO.getIssueUrl() == null || StringUtils.isEmpty(taskOrderItemDO.getIssueUrl())){
+            if (taskOrderItemDO.getIssueUrl() == null || StringUtils.isEmpty(taskOrderItemDO.getIssueUrl()) || isCover){
                 try {
 
                     if (TaskOrderStatusEnum.REPORT_FINISH.getStatus().equals(taskOrderItemDO.getTaskStatus())){

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

@@ -92,7 +92,7 @@ public interface BoilerTaskOrderIssueReportService extends IService<BoilerTaskOr
 
     BoilerTaskOrderArchiveDetailRespVO archiveDetail(String orderItemId);
 
-    void createIssueUrl(String orderId);
+    void createIssueUrl(String orderId,boolean isCover);
 
     //生成整个任务单中所有的报告pdf
     void generateAllReportsIssueUrl(String orderId);

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

@@ -1855,7 +1855,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     }
 
     @Override
-    public void createIssueUrl(String orderId) {
+    public void createIssueUrl(String orderId,boolean isCover) {
         try {
             BoilerTaskOrderDO taskOrderDO = taskOrderMapper.selectById(orderId);
             List<BoilerTaskOrderItemDO> taskOrderItemDOS = taskOrderItemMapper.selectList(BoilerTaskOrderItemDO::getOrderId, orderId);
@@ -1864,7 +1864,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                     BoilerTaskOrderItemDO updateOb = new BoilerTaskOrderItemDO();
 
                     //生成报告pdf
-                    ReportUrlInfo reportUrlInfo = generateReportUrl(taskOrderItemDO,true);
+                    ReportUrlInfo reportUrlInfo = generateReportUrl(taskOrderItemDO,isCover);
                     String reportUrl = reportUrlInfo.getReportUrl();
                     String fileUrl = reportUrlInfo.getFileUrl();
 

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

@@ -862,7 +862,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             boilerTaskOrderService.syncAllReportDataByOrderItemId(syncReportVO);
 
             //生成任务单下所有设备报告
-            commonThread.runWithOutResult(() -> boilerTaskOrderIssueReportService.createIssueUrl(boilerTaskOrderDO.getId()));
+            commonThread.runWithOutResult(() -> boilerTaskOrderIssueReportService.createIssueUrl(boilerTaskOrderDO.getId(),true));
 
             //生成任务单下所有的报告PDF
             commonThread.runWithOutResult(() -> boilerTaskOrderIssueReportService.generateAllReportsIssueUrl(boilerTaskOrderDO.getId()));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemsuspend/BoilerTaskOrderItemSuspendServiceImpl.java

@@ -367,7 +367,7 @@ public class BoilerTaskOrderItemSuspendServiceImpl extends ServiceImpl<BoilerTas
                 });
 
                 //生成任务单下所有设备报告
-                commonThread.runWithOutResult(() -> taskOrderIssueReportService.createIssueUrl(taskOrderDO.getId()));
+                commonThread.runWithOutResult(() -> taskOrderIssueReportService.createIssueUrl(taskOrderDO.getId(),false));
 
                 //合同收费/属于免征则直接发送报告
                 if (Integer.valueOf(200).equals(taskOrderDO.getFeeType()) || Integer.valueOf(300).equals(taskOrderDO.getFeeNature())) {

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

@@ -5379,7 +5379,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
 
                     // 报告模板
-                    if (taskOrderReportDO.getIssueUrl() == null) {
+                    if (taskOrderReportDO.getIssueUrl() == null || isCover) {
                         DynamicTbInsDO insDO = dynamicTbInsService.getDynamicRefId("report_" + taskOrderReportDO.getId());
                         if (insDO != null) {
                             byte[] pdf = pdfService.pdf(taskOrderReportDO.getReportTemplateId(), insDO.getId());
@@ -5419,8 +5419,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             mergedPdfBytes = null;
             mergeOutputStream.close();
 
-            //如果报告办结且没有保存办结报告PDF则生成
-            if (taskOrderDO.getIssueUrl() == null || StringUtils.isEmpty(taskOrderDO.getIssueUrl())){
+            //如果报告办结且没有保存办结报告PDF则生成,传的是需要覆盖时也重新生成
+            if (taskOrderDO.getIssueUrl() == null || StringUtils.isEmpty(taskOrderDO.getIssueUrl()) || isCover){
                 try {
 
                     if (TaskOrderStatusEnum.REPORT_FINISH.getStatus().equals(taskOrderDO.getTaskStatus())){

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

@@ -105,7 +105,7 @@ public interface PipeTaskOrderIssueReportService extends IService<PipeTaskOrderI
 
     PipeTaskOrderArchiveDetailRespVO archiveDetail(String orderItemId);
 
-    void createIssueUrl(String orderId);
+    void createIssueUrl(String orderId,boolean isCover);
 
     //生成整个任务单中所有的报告pdf
     void generateAllReportsIssueUrl(String orderId);

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

@@ -1955,12 +1955,12 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     }
 
     @Override
-    public void createIssueUrl(String orderId) {
+    public void createIssueUrl(String orderId,boolean isCover) {
         try {
             PipeTaskOrderDO taskOrderDO = taskOrderMapper.selectById(orderId);
 
             //生成报告pdf
-            ReportUrlInfo reportUrlInfo = generateReportUrl(taskOrderDO,true);
+            ReportUrlInfo reportUrlInfo = generateReportUrl(taskOrderDO,isCover);
             String reportUrl = reportUrlInfo.getReportUrl();
             String fileUrl = reportUrlInfo.getFileUrl();
 

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

@@ -855,7 +855,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             pipeTaskOrderService.syncAllReportDataByOrderId(syncReportVO);
 
             //生成任务单下所有设备报告
-            commonThread.runWithOutResult(() -> pipeTaskOrderIssueReportService.createIssueUrl(pipeTaskOrderDO.getId()));
+            commonThread.runWithOutResult(() -> pipeTaskOrderIssueReportService.createIssueUrl(pipeTaskOrderDO.getId(),true));
 
             //生成任务单下所有的报告PDF
             commonThread.runWithOutResult(() -> pipeTaskOrderIssueReportService.generateAllReportsIssueUrl(pipeTaskOrderDO.getId()));