记录校核

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

@@ -40,6 +40,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 import static cn.start.tz.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemrecheck.vo.BoilerTaskOrderItemRecheckRespVO;
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 
 @Tag(name = "管理后台 - 锅炉检验任务确认")
@@ -261,6 +262,12 @@ public class BoilerTaskOrderController {
         return success(pageResult);
     }
 
+    @GetMapping("/order-item/recheck/related/{orderItemId}")
+    @Operation(summary = "获取同一orderItemId+当前校核人的所有待校核项（跨报告合并）")
+    public CommonResult<List<BoilerTaskOrderItemRecheckRespVO>> getRelatedRecheckItems(@PathVariable String orderItemId) {
+        return success(boilerTaskOrderService.getRecheckItemsByOrderItemId(orderItemId));
+    }
+
     @GetMapping("/order-item/get")
     @Operation(summary = "任务单-设备项详情")
     public CommonResult<BoilerOrderItemDetailVO> getOrderItem(String id) {
@@ -504,6 +511,13 @@ public class BoilerTaskOrderController {
         return success(result);
     }
 
+    @PutMapping("/order-item/report/batch-recheck/rollback")
+    @Operation(summary = "批量退回校核")
+    public CommonResult<Boolean> batchRecheckRollback(@RequestBody OrderItemReportRollbackBatchVO rollbackVO) {
+        Boolean result = boilerTaskOrderService.batchRecheckRollback(rollbackVO);
+        return success(result);
+    }
+
     @PutMapping("/service-from/update")
     @Operation(summary = "编辑承压任务单葡萄城受理单")
     public CommonResult<Boolean> serviceFromUpdate(@Valid @RequestBody OrderFormEnterReqVO reqVO) throws Exception {

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

@@ -0,0 +1,18 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 批量退回校核请求 VO")
+@Data
+public class OrderItemReportRollbackBatchVO {
+
+    @Schema(description = "批量报告ids")
+    private List<String> ids;
+
+    @Schema(description = "退回原因")
+    private String returnReason;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemrecheck/vo/BoilerTaskOrderItemRecheckRespVO.java

@@ -26,6 +26,9 @@ public class BoilerTaskOrderItemRecheckRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "报告名称", example = "测厚")
+    private String reportName;
+
     @Schema(description = "图片")
     private String image;
     @Schema(description = "视频")

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

@@ -13,6 +13,7 @@ import cn.start.tz.module.pressure2.controller.admin.equippipescheduling.vo.Equi
 import cn.start.tz.module.pressure2.controller.admin.equippipescheduling.vo.EquipPipePlanSchedulingVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderUserVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemrecheck.vo.PipeTaskOrderItemRecheckRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.OrderItemReportUpdateVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderoperation.vo.PipeTaskOrderOperationPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderoperation.vo.PipeTaskOrderOperationRespVO;
@@ -231,6 +232,12 @@ public class PipeTaskOrderController {
         return success(pageResult);
     }
 
+    @GetMapping("/order-item/recheck/related/{orderItemId}")
+    @Operation(summary = "获取同一orderItemId+当前校核人的所有待校核项（跨报告合并）")
+    public CommonResult<List<PipeTaskOrderItemRecheckRespVO>> getRelatedRecheckItems(@PathVariable String orderItemId) {
+        return success(pipeTaskOrderService.getRecheckItemsByOrderItemId(orderItemId));
+    }
+
     @GetMapping("/order-item/get")
     @Operation(summary = "任务单-设备项详情")
     public CommonResult<PipeOrderItemDetailVO> getOrderItem(String id) {
@@ -464,6 +471,13 @@ public class PipeTaskOrderController {
         return success(result);
     }
 
+    @PutMapping("/order-item/report/batch-recheck/rollback")
+    @Operation(summary = "批量退回校核")
+    public CommonResult<Boolean> batchRecheckRollback(@RequestBody OrderItemReportRollbackBatchVO rollbackVO) {
+        Boolean result = pipeTaskOrderService.batchRecheckRollback(rollbackVO);
+        return success(result);
+    }
+
     @PutMapping("/service-from/update")
     @Operation(summary = "编辑承压任务单葡萄城受理单")
     public CommonResult<Boolean> serviceFromUpdate(@Valid @RequestBody OrderFormEnterReqVO reqVO) throws Exception {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitemreport/BoilerTaskOrderItemReportMapper.java

@@ -203,6 +203,17 @@ public interface BoilerTaskOrderItemReportMapper extends BaseMapperX<BoilerTaskO
 
     List<BoilerTaskOrderItemReportDO> selectGenerateReportList(String orderId);
 
+    /**
+     * 根据 orderItemId + 校核人ID + 审核中状态 查询待校核报告列表（用于批量校核弹窗）
+     */
+    default List<BoilerTaskOrderItemReportDO> selectListByOrderItemIdAndRecheckId(String orderItemId, String recheckId) {
+        return selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
+                .eq(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemId)
+                .eq(BoilerTaskOrderItemReportDO::getRecheckId, recheckId)
+                .eq(BoilerTaskOrderItemReportDO::getRecheckStatus, 100)
+                .orderByDesc(BoilerTaskOrderItemReportDO::getCreateTime));
+    }
+
     /**
      * OA审核/审批分页查询（独立方法，不影响原有接口）
      * 按summaryId + taskStatus过滤报告，关联任务单、设备、报告用户信息

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitemreport/PipeTaskOrderItemReportMapper.java

@@ -208,6 +208,17 @@ public interface PipeTaskOrderItemReportMapper extends BaseMapperX<PipeTaskOrder
 
     List<PipeTaskOrderItemReportDO> selectGenerateReportList(String orderId);
 
+    /**
+     * 根据 orderItemId + 校核人ID + 审核中状态 查询待校核报告列表（用于批量校核弹窗）
+     */
+    default List<PipeTaskOrderItemReportDO> selectListByOrderItemIdAndRecheckId(String orderId, String recheckId) {
+        return selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
+                .eq(PipeTaskOrderItemReportDO::getOrderId, orderId)
+                .eq(PipeTaskOrderItemReportDO::getRecheckId, recheckId)
+                .eq(PipeTaskOrderItemReportDO::getRecheckStatus, 100)
+                .orderByDesc(PipeTaskOrderItemReportDO::getCreateTime));
+    }
+
     /**
      * OA审核/审批分页查询（独立方法，不影响原有接口）
      * 按summaryId + taskStatus过滤报告，关联任务单、设备、报告用户信息

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

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import jakarta.validation.*;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemrecheck.vo.BoilerTaskOrderItemRecheckRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.framework.common.pojo.PageResult;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -117,6 +118,11 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
 
     PageResult<BoilerOrderItemPageRespVO> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
+    /**
+     * 获取同一 orderItemId + 当前校核人 的所有待校核项（跨报告合并，用于批量校核弹窗）
+     */
+    List<BoilerTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String orderItemId);
+
     BoilerOrderItemDetailVO getOrderItemDetail(String id);
 
     BoilerOrderItemDetailVO getOrderItemDetailForApp(String id);
@@ -175,6 +181,8 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
 
     Boolean batchRecheckApprove(OrderItemReportApproveBatchVO orderItemReportApproveBatchVO);
 
+    Boolean batchRecheckRollback(OrderItemReportRollbackBatchVO rollbackVO);
+
 
     Boolean approve(BoilerTaskOrderAuditVO reqVO);
 

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

@@ -1587,6 +1587,17 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     }
 
+    @Override
+    public Boolean batchRecheckRollback(OrderItemReportRollbackBatchVO rollbackVO) {
+        for (String id : rollbackVO.getIds()) {
+            BoilerTaskOrderAuditSingleVO reject = new BoilerTaskOrderAuditSingleVO();
+            reject.setId(id);
+            reject.setReason(rollbackVO.getReturnReason());
+            recheckOrderItemReject(reject);
+        }
+        return true;
+    }
+
     @Override
     public Boolean approve(BoilerTaskOrderAuditVO reqVO) {
         String userId = getLoginUserId();
@@ -3684,6 +3695,22 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     }
 
+    @Override
+    public List<BoilerTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String orderItemId) {
+        String recheckUserId = getLoginUserId().toString();
+        List<BoilerTaskOrderItemReportDO> reports = taskOrderItemReportMapper
+                .selectListByOrderItemIdAndRecheckId(orderItemId, recheckUserId);
+        return reports.stream().map(r -> {
+            BoilerTaskOrderItemRecheckRespVO vo = new BoilerTaskOrderItemRecheckRespVO();
+            vo.setReportId(r.getId());
+            vo.setReportName(r.getReportName());
+            vo.setImage(r.getImage());
+            vo.setVideo(r.getVideo());
+            vo.setAttachment(r.getAttachment());
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
     @Override
     public BoilerOrderItemDetailVO getOrderItemDetail(String id) {
         BoilerTaskOrderItemDO taskOrderItemDO = boilerTaskOrderItemMapper.selectById(id);

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

@@ -6,6 +6,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
 import cn.start.tz.module.pressure2.controller.admin.costfield.vo.CostFieldRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.*;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemrecheck.vo.PipeTaskOrderItemRecheckRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.OrderItemReportUpdateVO;
 import cn.start.tz.module.pressure2.controller.admin.platformEquip.vo.BoilerTaskOrderItemDetailsVO;
 import cn.start.tz.module.pressure2.controller.admin.platformEquip.vo.PipeTaskOrderItemDetailsVO;
@@ -100,6 +101,11 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     PageResult<PipeOrderItemPageRespVO> recheckOrderItemPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
+    /**
+     * 获取同一 orderItemId + 当前校核人 的所有待校核项（跨报告合并，用于批量校核弹窗）
+     */
+    List<PipeTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String orderItemId);
+
     PipeOrderItemDetailVO getOrderItemDetail(String id);
 
     void recheckOrderItemApprove(@Valid BoilerTaskOrderAuditSingleVO taskOrderAuditSingleVO);
@@ -151,6 +157,8 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     Boolean batchRecheckApprove(OrderItemReportApproveBatchVO orderItemReportApproveBatchVO);
 
+    Boolean batchRecheckRollback(OrderItemReportRollbackBatchVO rollbackVO);
+
 
     Boolean approve(BoilerTaskOrderAuditVO reqVO);
 

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

@@ -2827,6 +2827,26 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
     }
 
+    @Override
+    public List<PipeTaskOrderItemRecheckRespVO> getRecheckItemsByOrderItemId(String inputId) {
+        // inputId 是 PRESSURE2_PIPE_TASK_ORDER_INPUT.ID，需先查出 ORDER_ID
+        PipeTaskOrderInputDO input = pipeTaskOrderInputMapper.selectById(inputId);
+        if (input == null) return new ArrayList<>();
+        String orderId = input.getOrderId();
+        String recheckUserId = getLoginUserId().toString();
+        List<PipeTaskOrderItemReportDO> reports = taskOrderItemReportMapper
+                .selectListByOrderItemIdAndRecheckId(orderId, recheckUserId);
+        return reports.stream().map(r -> {
+            PipeTaskOrderItemRecheckRespVO vo = new PipeTaskOrderItemRecheckRespVO();
+            vo.setReportId(r.getId());
+            vo.setReportName(r.getReportName());
+            vo.setImage(r.getImage());
+            vo.setVideo(r.getVideo());
+            vo.setAttachment(r.getAttachment());
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
     @Override
     public PipeOrderItemDetailVO getOrderItemDetail(String id) {
 
@@ -4385,6 +4405,17 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
     }
 
+    @Override
+    public Boolean batchRecheckRollback(OrderItemReportRollbackBatchVO rollbackVO) {
+        for (String id : rollbackVO.getIds()) {
+            BoilerTaskOrderAuditSingleVO reject = new BoilerTaskOrderAuditSingleVO();
+            reject.setId(id);
+            reject.setReason(rollbackVO.getReturnReason());
+            recheckOrderItemReject(reject);
+        }
+        return true;
+    }
+
     @Override
     public Boolean approve(BoilerTaskOrderAuditVO reqVO) {