app，锅炉任务单详情调整数据组装逻辑

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorder/AppApiBoilerTaskOrderController.java

@@ -269,7 +269,7 @@ public class AppApiBoilerTaskOrderController {
     @GetMapping("/order-item/get")
     @Operation(summary = "任务单-设备项详情")
     public CommonResult<BoilerOrderItemDetailVO> getOrderItem(String id) {
-        BoilerOrderItemDetailVO orderItemDetail = boilerTaskOrderService.getOrderItemDetail(id);
+        BoilerOrderItemDetailVO orderItemDetail = boilerTaskOrderService.getOrderItemDetailForApp(id);
         return success(orderItemDetail);
     }
 

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

@@ -213,6 +213,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
@@ -3863,6 +3864,31 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         return orderItemDetailVO;
     }
 
+    @Override
+    public BoilerOrderItemDetailVO getOrderItemDetailForApp(String id) {
+        BoilerOrderItemDetailVO orderItemDetail = getOrderItemDetail(id);
+        if (orderItemDetail == null) {
+            return null;
+        }
+        BoilerTaskOrderRespVO taskOrder = orderItemDetail.getTaskOrder();
+        // 所有检验方案
+//        List<BoilerTaskOrderItemReportDO> inspectionPlanList = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>().
+//                eq(BoilerTaskOrderItemReportDO::getOrderId, taskOrder.getId())
+//        );
+        List<BoilerTaskOrderReportDO> inspectionPlanList = taskOrderReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderReportDO>()
+                .eq(BoilerTaskOrderReportDO::getOrderId, taskOrder.getId())
+                .eq(BoilerTaskOrderReportDO::getReportType, 600)
+        );
+        List<BoilerOrderItemReportVO> reportList = orderItemDetail.getReportList();
+        reportList = reportList != null ? reportList : new ArrayList<>();
+        List<BoilerOrderItemReportVO> newReportList = Stream.concat(
+                reportList.stream().filter(report -> !Objects.equals(report.getReportType(), 600)),
+                inspectionPlanList.stream().map(orderReport -> BeanUtils.toBean(orderReport, BoilerOrderItemReportVO.class))
+        ).toList();
+        orderItemDetail.setReportList(newReportList);
+        return orderItemDetail;
+    }
+
     @Override
     @Transactional
     public void recheckOrderItemApprove(BoilerTaskOrderAuditSingleVO taskOrderAuditSingleVO) {