app，调整校核列表接口、安全检查记录签名无法预览PDF的问题

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

@@ -437,4 +437,6 @@ public class BoilerOrderItemPageRespVO {
      */
     private LocalDateTime ratifyTime;
 
+    private List<BoilerTaskOrderItemRecheckRespVO> recheckReportList;
+
 }

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

@@ -437,4 +437,7 @@ public class PipeOrderItemPageRespVO {
      * 批准时间
      */
     private LocalDateTime ratifyTime;
+
+
+    private List<PipeTaskOrderItemRecheckRespVO> recheckReportList;
 }

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

@@ -695,7 +695,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         BoilerTaskOrderRespVO boilerTaskOrderRespVO = getBoilerTaskOrder(id);
         List<BoilerTaskOrderItemDetailVO> orderItems = boilerTaskOrderRespVO.getOrderItems();
         // ================================== 主检人 ===================================
-        Map<String, List<BoilerTaskOrderItemDetailVO>> mainCheckerIdToOrderItemsMap = orderItems.stream().collect(Collectors.groupingBy(BoilerTaskOrderItemDetailVO::getMainChecker));
+        Map<String, List<BoilerTaskOrderItemDetailVO>> mainCheckerIdToOrderItemsMap = orderItems.stream()
+                .filter(item -> item.getMainChecker() != null)
+                .collect(Collectors.groupingBy(BoilerTaskOrderItemDetailVO::getMainChecker));
         Map<String, AdminUserRespDTO> userIdToEntityMap = adminUserApi.getUserMap(mainCheckerIdToOrderItemsMap.keySet());
         for (Map.Entry<String, AdminUserRespDTO> userIdToEntityEntry : userIdToEntityMap.entrySet()) {
             String mainCheckerId = userIdToEntityEntry.getKey();
@@ -4090,6 +4092,15 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 boilerOrderItemPageRespVO.setMainCheckerUser(user);
             }
         }
+
+
+        // ============================ 设置校核记录 =====================
+        for (BoilerOrderItemPageRespVO boilerOrderItemPageRespVO : list) {
+            String orderItemId = boilerOrderItemPageRespVO.getId();
+            List<BoilerTaskOrderItemRecheckRespVO> recheckReportList = getRecheckItemsByOrderItemId(orderItemId);
+            boilerOrderItemPageRespVO.setRecheckReportList(recheckReportList);
+        }
+
         return recheckedOrderItemPage;
     }
 

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

@@ -2996,6 +2996,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
         }
 
+
+        for (PipeOrderItemPageRespVO pipeOrderItemPageRespVO : list) {
+            List<PipeTaskOrderItemRecheckRespVO> recheckItemsByOrderItemId = getRecheckItemsByOrderItemId(pipeOrderItemPageRespVO.getId());
+            pipeOrderItemPageRespVO.setRecheckReportList(recheckItemsByOrderItemId);
+        }
+
         return pipeOrderItemPageRespVOPageResult;
     }