报告归档调整

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

@@ -5751,6 +5751,21 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 //                .orderByAsc(BoilerTaskOrderItemReportDO::getReportType)
 //                .orderByAsc(BoilerTaskOrderItemReportDO::getSort));
 
+        BoilerTaskOrderItemDO taskOrderItemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+        if (taskOrderItemDO.getIssueUrl() != null && !taskOrderItemDO.getIssueUrl().isEmpty()){
+            try {
+
+                log.info("---获取已生成报告PDF---");
+                byte[] bytes = fileApi.getFileByPath(taskOrderItemDO.getIssueUrl()).getCheckedData();
+                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                byteArrayOutputStream.write(bytes);
+                return byteArrayOutputStream.toByteArray();
+
+            } catch (Exception e) {
+                log.error("---获取已生成报告PDF失败---", e);
+            }
+        }
+
         List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectGenerateReportList(orderItemId);
 
         if (CollUtil.isEmpty(taskOrderReportDOS)) {

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

@@ -4994,6 +4994,21 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 //                .orderByAsc(PipeTaskOrderItemReportDO::getSort)
 //                .orderByAsc(PipeTaskOrderItemReportDO::getReportType)); //主报告排最前面
 
+        PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(orderId);
+        if (taskOrderDO.getIssueUrl() != null && !taskOrderDO.getIssueUrl().isEmpty()){
+            try {
+
+                log.info("---获取已生成报告PDF---");
+                byte[] bytes = fileApi.getFileByPath(taskOrderDO.getIssueUrl()).getCheckedData();
+                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                byteArrayOutputStream.write(bytes);
+                return byteArrayOutputStream.toByteArray();
+
+            } catch (Exception e) {
+                log.error("---获取已生成报告PDF失败---", e);
+            }
+        }
+
         List<PipeTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectGenerateReportList(orderId);
 
         if (CollUtil.isEmpty(taskOrderReportDOS)) {