1、设备档案功能，需要支持修改设备档案，并同步至报告与设备基础库中 2、取消默认上一次检验记录的功能 3、记录校核人选择范围需限定为设备任务单中的检测员

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

@@ -5,9 +5,12 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorderoperation.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.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeRecheckUserPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.service.boilertaskorderitemreport.BoilerTaskOrderItemReportService;
 import cn.start.tz.module.pressure2.service.boilertaskorderoperation.BoilerTaskOrderOperationService;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -523,6 +526,13 @@ public class BoilerTaskOrderController {
         return success(approve);
     }
 
+    @PutMapping("/syncAllReportDataByOrderItemId")
+    @Operation(summary = "同步设备下对应设备下所有的记录、报告和结论报告数据")
+    public CommonResult<Boolean> syncAllReportDataByOrderItemId(@Valid @RequestBody BoilerTaskOrderSyncReportVO reqVO) {
+        Boolean approve = boilerTaskOrderService.syncAllReportDataByOrderItemId(reqVO);
+        return success(approve);
+    }
+
     @GetMapping("/inspection-opinion/page")
     @Operation(summary = "检验意见通知书")
     @Tag(name = "检验意见通知书")
@@ -530,4 +540,12 @@ public class BoilerTaskOrderController {
         PageResult<BoilerOrderItemPageRespVO> taskOrderPage = boilerTaskOrderService.inspectionOpinionPage(pageReqVO);
         return success(taskOrderPage);
     }
+
+    @GetMapping("/recheckUser/page")
+    @Operation(summary = "获得校验用户分页列表")
+    public CommonResult<PageResult<AdminUserRespDTO>> getUserPage(@Valid BoilerRecheckUserPageReqVO pageReqVO) {
+
+        PageResult<AdminUserRespDTO> userList = boilerTaskOrderService.getRecheckUserPage(pageReqVO);
+        return success(userList);
+    }
 }

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

@@ -0,0 +1,56 @@
+package cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 用户分页 Request VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class BoilerRecheckUserPageReqVO extends PageParam {
+
+    @Schema(description = "用户账号，模糊匹配", example = "tz")
+    private String username;
+
+    @Schema(description = "手机号码，模糊匹配", example = "tz")
+    private String mobile;
+
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
+    private Integer status;
+
+    @Schema(description = "创建时间", example = "2022-07-01 00:00:00, 2022-07-01 23:59:59")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门编号，同时筛选子部门", example = "1024")
+    private String deptId;
+
+    @Schema(description = "角色编号", example = "1024")
+    private String roleId;
+
+    @Schema(description = "角色标识", example = "1024")
+    private String roleCode;
+
+    @Schema(description = "用户昵称", example = "1024")
+    private String nickName;
+
+    /**
+     * 用户工号
+     */
+    @Schema(description = "用户工号", example = "1024")
+    private String employeeNo;
+
+    @Schema(description = "任务单ID")
+    private String orderId;
+
+}

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

@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class BoilerTaskOrderSyncReportVO {
 
-    @Schema(description = "报表ID",requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "报表ID")
     private String refId;
 
     @Schema(description = "报表类型 record-记录 report-报告 result-结论报告")
@@ -20,4 +20,7 @@ public class BoilerTaskOrderSyncReportVO {
     @Schema(description = "附加数据")
     private JSONObject params;
 
+    @Schema(description = "检验设备ID")
+    private String orderItemId;
+
 }

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

@@ -537,6 +537,13 @@ public class PipeTaskOrderController {
         return success(approve);
     }
 
+    @PutMapping("/syncAllReportDataByOrderId")
+    @Operation(summary = "同步任务单对应设备下所有的记录、报告和结论报告数据")
+    public CommonResult<Boolean> syncAllReportDataByOrderId(@Valid @RequestBody PipeTaskOrderSyncReportVO reqVO) {
+        Boolean approve = pipeTaskOrderService.syncAllReportDataByOrderId(reqVO);
+        return success(approve);
+    }
+
     @GetMapping("/getEquipsByOrderId")
     @Operation(summary = "通过任务单ID获得设备列表")
     public CommonResult<List<PipeEquipInfoVO>> getEquipsByOrderId(@RequestParam("orderId") String orderId) {

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

@@ -0,0 +1,21 @@
+package cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 承压任务单 Response VO")
+@Data
+public class PipeTaskOrderSyncReportVO {
+
+    @Schema(description = "任务单ID",requiredMode = Schema.RequiredMode.REQUIRED)
+    private String orderId;
+
+//    @Schema(description = "设备Id")
+//    private String equipId;
+
+    @Schema(description = "附加数据")
+    private JSONObject params;
+
+}

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

@@ -5,10 +5,12 @@ import cn.start.tz.module.pressure2.controller.admin.costfield.vo.CostFieldRespV
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.EquipBoilerSchedulingBoilersRespVO;
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.EquipBoilerSchedulingPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeRecheckUserPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderitem.BoilerAcceptOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import jakarta.validation.*;
@@ -193,6 +195,9 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
 
     Boolean syncAllReportData(BoilerTaskOrderSyncReportVO reqVO);
 
+    Boolean syncAllReportDataByOrderItemId(BoilerTaskOrderSyncReportVO reqVO);
+
     PageResult<BoilerOrderItemPageRespVO> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
 
+    PageResult<AdminUserRespDTO> getRecheckUserPage(BoilerRecheckUserPageReqVO pageReqVO);
 }

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

@@ -30,6 +30,8 @@ import cn.start.tz.module.member.api.user.dto.MemberUserRespDTO;
 import cn.start.tz.module.pressure2.constant.TemplateIdConstants;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitempart.vo.BoilerTaskOrderItemPartSaveReqVO;
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.BoilerDeleteTask;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeRecheckUserPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
@@ -5766,6 +5768,21 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         return false;
     }
 
+    @Override
+    public Boolean syncAllReportDataByOrderItemId(BoilerTaskOrderSyncReportVO reportVO) {
+
+        List<BoilerTaskOrderItemReportDO> itemReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
+                .in(BoilerTaskOrderItemReportDO::getOrderItemId, reportVO.getOrderItemId()));
+
+        itemReportDOS.forEach(itemReportDO -> {
+            BoilerTaskOrderSyncReportVO reqVO = new BoilerTaskOrderSyncReportVO();
+            reqVO.setRefId(itemReportDO.getId());
+            syncAllReportData(reqVO);
+        });
+
+        return true;
+    }
+
     /**
      * 模板信息内部类
      */
@@ -5787,6 +5804,40 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         }
     }
 
+    @Override
+    public PageResult<AdminUserRespDTO> getRecheckUserPage(BoilerRecheckUserPageReqVO pageReqVO) {
+
+        PageResult<AdminUserRespDTO> pageResult = new PageResult<>();
+
+        List<BoilerTaskOrderUserDO> orderUserDOList = boilerTaskOrderUserMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderUserDO>().
+                eq(BoilerTaskOrderUserDO::getOrderId, pageReqVO.getOrderId()));
+
+        if (!orderUserDOList.isEmpty()) {
+
+            List<String> uIds = new ArrayList<>(orderUserDOList.stream().map(BoilerTaskOrderUserDO::getUserId).toList());
+            List<AdminUserRespDTO> userList = adminUserApi.getUserList(uIds).getData();
+
+            if (pageReqVO.getNickName() != null){
+                userList = userList.stream().filter(user -> user.getNickname().contains(pageReqVO.getNickName()))
+                        .toList();
+            }
+
+            AdminUserRespDTO userRespDTO = adminUserApi.getUser("b5369aeb73954430eef53a9c8b7586ee").getCheckedData();
+            ArrayList<AdminUserRespDTO> adminUserRespDTOS = new ArrayList<>(userList);
+            adminUserRespDTOS.add(userRespDTO);
+
+            pageResult.setList(adminUserRespDTOS);
+            pageResult.setTotal((long) adminUserRespDTOS.size());
+
+            return pageResult;
+
+        }
+
+        return pageResult;
+
+    }
+
+
     @Override
     public PageResult<BoilerOrderItemPageRespVO> inspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {
         //构建查询参数

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12171_202400RecordOFData.java

@@ -72,49 +72,49 @@ public class QC12171_202400RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null){
 
-            //第一次生成压力管道年度检查记录由上次记录生成
-            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
-            //是否第一次生成
-            if (firstInsDO == null){
-
-                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
-                PipeTaskOrderDO lastTaskOrderDO = pipeTaskOrderMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderDO>()
-                        .eq(PipeTaskOrderDO::getUnitCode, taskOrderDO.getUnitCode())
-                        .orderByDesc(PipeTaskOrderDO::getCreateTime)
-                        .ne(PipeTaskOrderDO::getId, refId)
-                        .last("LIMIT 1"));
-
-                if (lastTaskOrderDO != null){
-
-                    //获取上次年度检查记录
-                    PipeTaskOrderItemReportDO lastItemReportDO = pipeTaskOrderItemReportMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderItemReportDO>()
-                            .eq(PipeTaskOrderItemReportDO::getOrderId, lastTaskOrderDO.getId())
-                            .eq(PipeTaskOrderItemReportDO::getTemplateId, ruleVO.getTemplateId())
-                            //获取报告编制之后的报表数据
-                            .in(PipeTaskOrderItemReportDO::getTaskStatus, 520, 600, 700, 710, 800)
-                            .last("LIMIT 1"));
-
-                    if (lastItemReportDO != null){
-
-                        DynamicTbInsDO insResultDO = dynamicTbInsService.getDynamicRefId(lastItemReportDO.getId());
-                        List<DynamicTbValDO> list = dynamicTbValService.lambdaQuery().eq(DynamicTbValDO::getInsId, insResultDO.getId()).list();
-
-                        if (!list.isEmpty()){
-
-                            list.forEach(val -> {
-                                //报告编号、检验员、校验员不带出
-                                if (val.getColCode().equals("reportNo") || val.getColCode().equals("checkUser") || val.getColCode().equals("recheckUser")
-                                        || val.getColCode().equals("checkDate") || val.getColCode().equals("recheckDate")){
-
-                                }else{
-                                    result.put(val.getColCode(),val.getValValue());
-                                }
-                            });
-
-                        }
-                    }
-                }
-            }
+//            //第一次生成压力管道年度检查记录由上次记录生成
+//            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+//            //是否第一次生成
+//            if (firstInsDO == null){
+//
+//                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
+//                PipeTaskOrderDO lastTaskOrderDO = pipeTaskOrderMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderDO>()
+//                        .eq(PipeTaskOrderDO::getUnitCode, taskOrderDO.getUnitCode())
+//                        .orderByDesc(PipeTaskOrderDO::getCreateTime)
+//                        .ne(PipeTaskOrderDO::getId, refId)
+//                        .last("LIMIT 1"));
+//
+//                if (lastTaskOrderDO != null){
+//
+//                    //获取上次年度检查记录
+//                    PipeTaskOrderItemReportDO lastItemReportDO = pipeTaskOrderItemReportMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderItemReportDO>()
+//                            .eq(PipeTaskOrderItemReportDO::getOrderId, lastTaskOrderDO.getId())
+//                            .eq(PipeTaskOrderItemReportDO::getTemplateId, ruleVO.getTemplateId())
+//                            //获取报告编制之后的报表数据
+//                            .in(PipeTaskOrderItemReportDO::getTaskStatus, 520, 600, 700, 710, 800)
+//                            .last("LIMIT 1"));
+//
+//                    if (lastItemReportDO != null){
+//
+//                        DynamicTbInsDO insResultDO = dynamicTbInsService.getDynamicRefId(lastItemReportDO.getId());
+//                        List<DynamicTbValDO> list = dynamicTbValService.lambdaQuery().eq(DynamicTbValDO::getInsId, insResultDO.getId()).list();
+//
+//                        if (!list.isEmpty()){
+//
+//                            list.forEach(val -> {
+//                                //报告编号、检验员、校验员不带出
+//                                if (val.getColCode().equals("reportNo") || val.getColCode().equals("checkUser") || val.getColCode().equals("recheckUser")
+//                                        || val.getColCode().equals("checkDate") || val.getColCode().equals("recheckDate")){
+//
+//                                }else{
+//                                    result.put(val.getColCode(),val.getValValue());
+//                                }
+//                            });
+//
+//                        }
+//                    }
+//                }
+//            }
 
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12171_202401RecordOFData.java

@@ -97,49 +97,49 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null) {
 
-            //第一次生成压力管道年度检查记录由上次记录生成
-            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
-            //是否第一次生成
-            if (firstInsDO == null) {
-
-                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
-                PipeTaskOrderDO lastTaskOrderDO = pipeTaskOrderMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderDO>()
-                        .eq(PipeTaskOrderDO::getUnitCode, taskOrderDO.getUnitCode())
-                        .orderByDesc(PipeTaskOrderDO::getCreateTime)
-                        .ne(PipeTaskOrderDO::getId, refId)
-                        .last("LIMIT 1"));
-
-                if (lastTaskOrderDO != null) {
-
-                    //获取上次年度检查记录
-                    PipeTaskOrderItemReportDO lastItemReportDO = pipeTaskOrderItemReportMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderItemReportDO>()
-                            .eq(PipeTaskOrderItemReportDO::getOrderId, lastTaskOrderDO.getId())
-                            .eq(PipeTaskOrderItemReportDO::getTemplateId, ruleVO.getTemplateId())
-                            //获取报告编制之后的报表数据
-                            .in(PipeTaskOrderItemReportDO::getTaskStatus, 520, 600, 700, 710, 800)
-                            .last("LIMIT 1"));
-
-                    if (lastItemReportDO != null) {
-
-                        DynamicTbInsDO insResultDO = dynamicTbInsService.getDynamicRefId(lastItemReportDO.getId());
-                        List<DynamicTbValDO> list = dynamicTbValService.lambdaQuery().eq(DynamicTbValDO::getInsId, insResultDO.getId()).list();
-
-                        if (!list.isEmpty()) {
-
-                            list.forEach(val -> {
-                                //报告编号、检验员、校验员不带出
-                                if (val.getColCode().equals("reportNo") || val.getColCode().equals("checkUser") || val.getColCode().equals("recheckUser")
-                                        || val.getColCode().equals("checkDate") || val.getColCode().equals("recheckDate")) {
-
-                                } else {
-                                    result.put(val.getColCode(), val.getValValue());
-                                }
-                            });
-
-                        }
-                    }
-                }
-            }
+//            //第一次生成压力管道年度检查记录由上次记录生成
+//            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+//            //是否第一次生成
+//            if (firstInsDO == null) {
+//
+//                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
+//                PipeTaskOrderDO lastTaskOrderDO = pipeTaskOrderMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderDO>()
+//                        .eq(PipeTaskOrderDO::getUnitCode, taskOrderDO.getUnitCode())
+//                        .orderByDesc(PipeTaskOrderDO::getCreateTime)
+//                        .ne(PipeTaskOrderDO::getId, refId)
+//                        .last("LIMIT 1"));
+//
+//                if (lastTaskOrderDO != null) {
+//
+//                    //获取上次年度检查记录
+//                    PipeTaskOrderItemReportDO lastItemReportDO = pipeTaskOrderItemReportMapper.selectOne(new LambdaQueryWrapper<PipeTaskOrderItemReportDO>()
+//                            .eq(PipeTaskOrderItemReportDO::getOrderId, lastTaskOrderDO.getId())
+//                            .eq(PipeTaskOrderItemReportDO::getTemplateId, ruleVO.getTemplateId())
+//                            //获取报告编制之后的报表数据
+//                            .in(PipeTaskOrderItemReportDO::getTaskStatus, 520, 600, 700, 710, 800)
+//                            .last("LIMIT 1"));
+//
+//                    if (lastItemReportDO != null) {
+//
+//                        DynamicTbInsDO insResultDO = dynamicTbInsService.getDynamicRefId(lastItemReportDO.getId());
+//                        List<DynamicTbValDO> list = dynamicTbValService.lambdaQuery().eq(DynamicTbValDO::getInsId, insResultDO.getId()).list();
+//
+//                        if (!list.isEmpty()) {
+//
+//                            list.forEach(val -> {
+//                                //报告编号、检验员、校验员不带出
+//                                if (val.getColCode().equals("reportNo") || val.getColCode().equals("checkUser") || val.getColCode().equals("recheckUser")
+//                                        || val.getColCode().equals("checkDate") || val.getColCode().equals("recheckDate")) {
+//
+//                                } else {
+//                                    result.put(val.getColCode(), val.getValValue());
+//                                }
+//                            });
+//
+//                        }
+//                    }
+//                }
+//            }
 
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));

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

@@ -188,6 +188,8 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     Boolean syncAllReportData(BoilerTaskOrderSyncReportVO reqVO);
 
+    Boolean syncAllReportDataByOrderId(PipeTaskOrderSyncReportVO reqVO);
+
     List<PipeEquipInfoVO> getEquipsByOrderId(String orderId);
 
     PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);

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

@@ -4645,6 +4645,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     reqVO.setParams(new com.alibaba.fastjson2.JSONObject());
                 }
                 reqVO.getParams().put("equipMainType","pipe");
+                reqVO.getParams().put("orderItemId",itemReportDO.getOrderItemId());
                 ruleVO.setParams(reqVO.getParams());
                         
                 //获取 tbCode 的服务方法名
@@ -4680,6 +4681,21 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         }
     }
 
+    @Override
+    public Boolean syncAllReportDataByOrderId(PipeTaskOrderSyncReportVO reportVO) {
+
+        List<PipeTaskOrderItemReportDO> itemReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
+                .in(PipeTaskOrderItemReportDO::getOrderId, reportVO.getOrderId()));
+
+        itemReportDOS.forEach(itemReportDO -> {
+            BoilerTaskOrderSyncReportVO reqVO = new BoilerTaskOrderSyncReportVO();
+            reqVO.setRefId(itemReportDO.getId());
+            syncAllReportData(reqVO);
+        });
+
+        return true;
+    }
+
     @Override
     public List<PipeEquipInfoVO> getEquipsByOrderId(String orderId) {