Merge remote-tracking branch 'origin/dev' into dev

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

@@ -262,7 +262,7 @@ public class AppApiBoilerTaskOrderController {
     @GetMapping("/order-item/recheck/page")
     @Operation(summary = "任务单-设备校核列表")
     public CommonResult<PageResult<BoilerOrderItemPageRespVO>> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
-        PageResult<BoilerOrderItemPageRespVO> pageResult = boilerTaskOrderService.recheckOrderItemPage(pageReqVO);
+        PageResult<BoilerOrderItemPageRespVO> pageResult = boilerTaskOrderService.recheckOrderItemPageForAPP(pageReqVO);
         return success(pageResult);
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/pipetaskorder/AppApiPipeTaskOrderController.java

@@ -222,7 +222,7 @@ public class AppApiPipeTaskOrderController {
     @GetMapping("/order-item/recheck/page")
     @Operation(summary = "任务单-设备校核列表")
     public CommonResult<PageResult<PipeOrderItemPageRespVO>> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
-        PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.recheckOrderItemPage(pageReqVO);
+        PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.recheckOrderItemPageForAPP(pageReqVO);
         return success(pageResult);
     }
 

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

@@ -118,6 +118,7 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
     void orderItemBatchCancel(@Valid List<BoilerOrderItemUpdateByIdVO> orderItemRatifyVOS);
 
     PageResult<BoilerOrderItemPageRespVO> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<BoilerOrderItemPageRespVO> recheckOrderItemPageForAPP(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
     /**
      * 获取同一 orderItemId + 当前校核人 的所有待校核项（跨报告合并，用于批量校核弹窗）

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

@@ -3962,6 +3962,31 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     }
 
+    @Override
+    public PageResult<BoilerOrderItemPageRespVO> recheckOrderItemPageForAPP(BoilerTaskOrderPageReqVO pageReqVO) {
+        PageResult<BoilerOrderItemPageRespVO> recheckedOrderItemPage = this.recheckOrderItemPage(pageReqVO);
+        List<BoilerOrderItemPageRespVO> list = recheckedOrderItemPage.getList();
+        list = list != null ? list : Collections.emptyList();
+        Map<String, List<BoilerOrderItemPageRespVO>> mainCheckerIdToRecheckOrderItemListMap = new HashMap<>();
+        for (BoilerOrderItemPageRespVO boilerOrderItemPageRespVO : list) {
+            String mainCheckerId = boilerOrderItemPageRespVO.getMainChecker();
+            List<BoilerOrderItemPageRespVO> recheckOrderItemList = mainCheckerIdToRecheckOrderItemListMap.computeIfAbsent(mainCheckerId, k -> new ArrayList<>());
+            recheckOrderItemList.add(boilerOrderItemPageRespVO);
+        }
+
+        Map<String, AdminUserRespDTO> idToUserMap = adminUserApi.getUserMap(mainCheckerIdToRecheckOrderItemListMap.keySet());
+        for (Map.Entry<String, AdminUserRespDTO> idToUserEntry : idToUserMap.entrySet()) {
+            String userId = idToUserEntry.getKey();
+            AdminUserRespDTO user = idToUserEntry.getValue();
+            List<BoilerOrderItemPageRespVO> recheckOrderItemList = mainCheckerIdToRecheckOrderItemListMap.get(userId);
+            recheckOrderItemList = recheckOrderItemList != null ? recheckOrderItemList : Collections.emptyList();
+            for (BoilerOrderItemPageRespVO boilerOrderItemPageRespVO : recheckOrderItemList) {
+                boilerOrderItemPageRespVO.setMainCheckerUser(user);
+            }
+        }
+        return recheckedOrderItemPage;
+    }
+
     @Override
     public List<BoilerTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String orderItemId) {
         String recheckUserId = getLoginUserId().toString();

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

@@ -100,6 +100,7 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
     void orderItemBatchCancel(@Valid List<BoilerOrderItemUpdateByIdVO> orderItemRatifyVOS);
 
     PageResult<PipeOrderItemPageRespVO> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<PipeOrderItemPageRespVO> recheckOrderItemPageForAPP(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
     /**
      * 获取同一 orderItemId + 当前校核人 的所有待校核项（跨报告合并，用于批量校核弹窗）

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

@@ -2888,6 +2888,33 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
     }
 
+    @Override
+    public PageResult<PipeOrderItemPageRespVO> recheckOrderItemPageForAPP(BoilerTaskOrderPageReqVO pageReqVO) {
+        PageResult<PipeOrderItemPageRespVO> pipeOrderItemPageRespVOPageResult = recheckOrderItemPage(pageReqVO);
+        List<PipeOrderItemPageRespVO> list = pipeOrderItemPageRespVOPageResult.getList();
+        list = list != null ? list : Collections.emptyList();
+
+        Map<String, List<PipeOrderItemPageRespVO>> mainCheckerIdToRecheckOrderItemListMap = new HashMap<>();
+        for (PipeOrderItemPageRespVO pipeOrderItemPageRespVO : list) {
+            String mainCheckerId = pipeOrderItemPageRespVO.getMainChecker();
+            List<PipeOrderItemPageRespVO> recheckOrderItemList = mainCheckerIdToRecheckOrderItemListMap.computeIfAbsent(mainCheckerId, k -> new ArrayList<>());
+            recheckOrderItemList.add(pipeOrderItemPageRespVO);
+        }
+
+        Map<String, AdminUserRespDTO> idToUserMap = adminUserApi.getUserMap(mainCheckerIdToRecheckOrderItemListMap.keySet());
+        for (Map.Entry<String, AdminUserRespDTO> idToUserEntry : idToUserMap.entrySet()) {
+            String userId = idToUserEntry.getKey();
+            AdminUserRespDTO user = idToUserEntry.getValue();
+            List<PipeOrderItemPageRespVO> recheckOrderItemList = mainCheckerIdToRecheckOrderItemListMap.get(userId);
+            recheckOrderItemList = recheckOrderItemList != null ? recheckOrderItemList : Collections.emptyList();
+            for (PipeOrderItemPageRespVO pipeOrderItemPageRespVO : recheckOrderItemList) {
+                pipeOrderItemPageRespVO.setMainCheckerUser(user);
+            }
+        }
+
+        return pipeOrderItemPageRespVOPageResult;
+    }
+
     @Override
     public List<PipeTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String inputId) {
         // inputId 是 PRESSURE2_PIPE_TASK_ORDER_INPUT.ID，需先查出 ORDER_ID

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -150,7 +150,7 @@
 
     <select id="selectJoinPageBatchReport">
         select rownum,a.* from (
-        select btoi.ID,
+        select btoi.ID,btoi.MAIN_CHECKER,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
         bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -144,7 +144,7 @@
 
     <select id="selectJoinPageBatchReport">
         select rownum,a.* from (
-        select btoi.ID,
+        select btoi.ID,btoi.MAIN_CHECKER,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
         bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,