调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderRespVO.java

@@ -404,4 +404,7 @@ public class BoilerTaskOrderRespVO {
 
     @Schema(description = "发放日期")
     private LocalDateTime issueTime;
+
+    @Schema(description = "发放报告状态")
+    private Integer isIssueReport;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -406,4 +406,8 @@ public class PipeTaskOrderRespVO {
     private LocalDateTime issueTime;
 
     private String inputId;
+
+    @Schema(description = "发放报告状态")
+    private Integer isIssueReport;
+
 }

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

@@ -563,9 +563,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         }
 
         // 报告数量
+        List<String> orderIds = taskOrderItemDOList.stream().map(PipeTaskOrderItemDO::getOrderId).toList();
         List<String> orderItemIds = taskOrderItemDOList.stream().map(PipeTaskOrderItemDO::getId).toList();
         List<PipeTaskOrderItemReportDO> itemReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>().
-                in(PipeTaskOrderItemReportDO::getOrderItemId, orderItemIds).
+                in(PipeTaskOrderItemReportDO::getOrderId, orderIds).
                 eq(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus()).
                 eq(PipeTaskOrderItemReportDO::getReportType, 100)
         );
@@ -1219,9 +1220,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             }
 
             // 报告数量
+            List<String> orderIds = taskOrderItemDOList.stream().map(PipeTaskOrderItemDO::getOrderId).toList();
             List<String> orderItemIds = taskOrderItemDOList.stream().map(PipeTaskOrderItemDO::getId).toList();
             List<PipeTaskOrderItemReportDO> itemReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>().
-                    in(PipeTaskOrderItemReportDO::getOrderItemId, orderItemIds).
+                    in(PipeTaskOrderItemReportDO::getOrderId, orderIds).
                     eq(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus()).
                     eq(PipeTaskOrderItemReportDO::getReportType, 100)
             );