调整

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

@@ -492,7 +492,7 @@ public class PipeTaskOrderController {
 
     @GetMapping("/order-item/initiateApproval/page")
     @Operation(summary = "任务单-审核列表")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.approveOpinionNoticePage(pageReqVO);
         return success(pageResult);
     }

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

@@ -12,6 +12,7 @@ import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeInspectionOpinionReportedExcelVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.app.taskorderitemreport.vo.InspectionOpinionUploadReqVo;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
@@ -74,7 +75,7 @@ public class PipeTaskOrderInspectionController {
     @GetMapping("/page")
     @Operation(summary = "检验意见通知书")
     @Tag(name = "检验意见通知书")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> taskOrderPage = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
         return success(taskOrderPage);
     }
@@ -82,7 +83,7 @@ public class PipeTaskOrderInspectionController {
     @GetMapping("/details")
     @Operation(summary = "检验意见通知书详情")
     public CommonResult<PipeOrderItemPageRespVO> appInspectionOpinionById(@RequestParam("id") String id) {
-        BoilerTaskOrderPageReqVO taskOrderPageReqVO = new BoilerTaskOrderPageReqVO();
+        PipeTaskOrderPageReqVO taskOrderPageReqVO = new PipeTaskOrderPageReqVO();
         taskOrderPageReqVO.setId(id);
         PageResult<PipeOrderItemPageRespVO> orderItemPageRespVOPageResult = pipeTaskOrderService.inspectionOpinionPage(taskOrderPageReqVO);
         if (!ObjectUtil.isEmpty(orderItemPageRespVOPageResult) && CollUtil.isNotEmpty(orderItemPageRespVOPageResult.getList())) {
@@ -108,7 +109,7 @@ public class PipeTaskOrderInspectionController {
     @PostMapping("/opinionReportedExcel/export-excel")
     @Operation(summary = "检验意见通知导出")
     @Tag(name = "检验意见通知导出")
-    public void opinionReportedExcel(@RequestBody BoilerTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void opinionReportedExcel(@RequestBody PipeTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         List<OpinionReportedExcelExcelVO> opinionReportedExcelExcelVOS = pipeTaskOrderInspectionService.opinionReportedExcel(pageReqVO);
         ExcelUtils.write(response, "承压报告-检验意见通知导出.xls", "数据", OpinionReportedExcelExcelVO.class, opinionReportedExcelExcelVOS);
     }
@@ -147,7 +148,7 @@ public class PipeTaskOrderInspectionController {
     @PostMapping("/reported/export-excel")
     @Operation(summary = "隐患上报记录导出")
     @Tag(name = "检验意见通知书隐患上报")
-    public void getAppointmentConfirmOrderRefuseItemReportedExcel(@RequestBody BoilerTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+    public void getAppointmentConfirmOrderRefuseItemReportedExcel(@RequestBody PipeTaskOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
         List<PipeInspectionOpinionReportedExcelVO> list = BeanUtils.toBean(pageResult.getList(), PipeInspectionOpinionReportedExcelVO.class);
         list.forEach(item -> {

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

@@ -172,7 +172,7 @@ public class PipeTaskOrderIssueReportController {
 
     @GetMapping("/order-item/report/conclusion/page")
     @Operation(summary = "任务单-报告结论列表")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> orderItemReportConclusionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> orderItemReportConclusionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = taskOrderIssueReportService.orderItemReportConclusionPage(pageReqVO);
         return success(pageResult);
     }

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

@@ -278,7 +278,7 @@ public class PipeTaskOrderPageReqVO extends PageParam {
     private List<String> ids;
 
     @Schema(description = "设备类型", example = "1")
-    private Integer equipType;
+    private String equipType;
 
     @Schema(description = "equipStreet")
     private Integer equipStreet;
@@ -424,4 +424,14 @@ public class PipeTaskOrderPageReqVO extends PageParam {
 
     @Schema(description ="公众号推送客户状态(0=成功,1=拒绝接收,2=其他原因失败,3=发送失败,4=未发送)")
     private List<Integer> mpSendStatusList;
+
+    private String socialCreditCode;
+
+    private String payerContact;
+
+    private String payerContactName;
+
+    private String nonTaxApplyStatus;
+
+    private String acceptUserId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorderitemreport/PipeAppTaskOrderItemReportController.java

@@ -46,7 +46,7 @@ public class PipeAppTaskOrderItemReportController {
 
     @GetMapping("/inspection-opinion/page")
     @Operation(summary = "检验意见通知书分页")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> appInspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> appInspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         return success(pipeAppTaskOrderItemReportService.appInspectionOpinionPage(pageReqVO));
     }
 

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

@@ -475,7 +475,7 @@ public class AppApiPipeTaskOrderController {
 
     @GetMapping("/order-item/initiateApproval/page")
     @Operation(summary = "任务单-审核列表")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> approveOpinionNoticePage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.approveOpinionNoticePage(pageReqVO);
         return success(pageResult);
     }
@@ -547,7 +547,7 @@ public class AppApiPipeTaskOrderController {
     @GetMapping("/inspection-opinion/page")
     @Operation(summary = "检验意见通知书")
     @Tag(name = "检验意见通知书")
-    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO) {
+    public CommonResult<PageResult<PipeOrderItemPageRespVO>> inspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> taskOrderPage = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
         return success(taskOrderPage);
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitem/BoilerTaskOrderItemMapper.java

@@ -10,6 +10,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerOr
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderItemDetailVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitem.vo.BoilerTaskOrderItemPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereport.BoilerTaskOrderIssueReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereportitem.BoilerTaskOrderIssueReportItemDO;
@@ -18,6 +19,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.Boi
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemuser.BoilerTaskOrderItemUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.opinionreporter.OpinionReporterDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
@@ -69,12 +71,13 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
                 selectAs(BoilerTaskOrderItemReportDO::getSubmitTime,BoilerOrderItemPageRespVO::getSubmitTime).
                 selectAs(BoilerTaskOrderItemReportDO::getTemplateId,BoilerOrderItemPageRespVO::getTemplateId).
                 selectAs(BoilerTaskOrderItemReportDO::getFinishUploadTime,BoilerOrderItemPageRespVO::getFinishUploadTime).
-                selectAs(BoilerTaskOrderDO::getSubmitId,BoilerOrderItemPageRespVO::getSubmitId).
+                selectAs(BoilerTaskOrderItemReportDO::getSubmitId,BoilerOrderItemPageRespVO::getSubmitId).
                 selectAs(EquipBoilerDO::getEquipCode,BoilerOrderItemPageRespVO::getEquipCode).
                 selectAs(EquipBoilerDO::getEquipName,BoilerOrderItemPageRespVO::getEquipName).
                 selectAs(EquipBoilerDO::getEquipStreet,BoilerOrderItemPageRespVO::getEquipStreet).
                 selectAs(EquipBoilerDO::getEquipDistrict,BoilerOrderItemPageRespVO::getEquipDistrict).
                 selectAs(EquipBoilerDO::getType,BoilerOrderItemPageRespVO::getEquipmentType).
+                selectAs(EquipBoilerDO::getUseRegisterNo, BoilerOrderItemPageRespVO::getUseRegisterNo).
 //                selectAs(EquipBoilerDO::getBeDistrict,BoilerOrderItemPageRespVO::getBeDistrict).
 //                selectAs(EquipBoilerDO::getEquipmentType,BoilerOrderItemPageRespVO::getEquipmentType).
                 selectAs(BoilerTaskOrderItemReportDO::getRecheckStatus,BoilerOrderItemPageRespVO::getRecheckStatus).
@@ -159,9 +162,10 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
         if(StringUtils.isNotBlank(reqVO.getEquipCode())) {
             recordDOMPJLambdaWrapper.like(BoilerTaskOrderItemDO::getEquipCode, reqVO.getEquipCode());
         }
-//        if(StringUtils.isNotBlank(reqVO.getProductNo())){
-//            recordDOMPJLambdaWrapper.like(EquipBoilerDO::getProductNo, reqVO.getProductNo());
-//        }
+
+        if(reqVO.getEquipType() != null){
+            recordDOMPJLambdaWrapper.like(EquipBoilerDO::getType, reqVO.getEquipType());
+        }
 
         if (StringUtils.isNotBlank(reqVO.getCheckProject())) {
             recordDOMPJLambdaWrapper.like(BoilerTaskOrderItemReportDO::getReportName, reqVO.getCheckProject());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitem/PipeTaskOrderItemMapper.java

@@ -14,6 +14,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTa
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitem.vo.BoilerTaskOrderItemPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderItemDetailVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderissuereportitem.BoilerTaskOrderIssueReportItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
@@ -64,7 +65,7 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
 
     Long selectJoinPageBatchReportCount(BoilerTaskOrderPageReqVO reqVO);
 
-    default PageResult<PipeOrderItemPageRespVO> selectJoinPageReport(BoilerTaskOrderPageReqVO reqVO){
+    default PageResult<PipeOrderItemPageRespVO> selectJoinPageReport(PipeTaskOrderPageReqVO reqVO){
         MPJLambdaWrapperX<PipeTaskOrderItemDO> recordDOMPJLambdaWrapper = new MPJLambdaWrapperX<>();
 
         recordDOMPJLambdaWrapper = (MPJLambdaWrapperX<PipeTaskOrderItemDO>)recordDOMPJLambdaWrapper.
@@ -80,7 +81,7 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
                 selectAs(PipeTaskOrderItemReportDO::getSubmitTime,PipeOrderItemPageRespVO::getSubmitTime).
                 selectAs(PipeTaskOrderItemReportDO::getTemplateId,PipeOrderItemPageRespVO::getTemplateId).
                 selectAs(PipeTaskOrderItemReportDO::getFinishUploadTime,PipeOrderItemPageRespVO::getFinishUploadTime).
-                selectAs(PipeTaskOrderDO::getSubmitId,PipeOrderItemPageRespVO::getSubmitId).
+                selectAs(PipeTaskOrderItemReportDO::getSubmitId,PipeOrderItemPageRespVO::getSubmitId).
                 selectAs(EquipPipeDO::getProjectNo,PipeOrderItemPageRespVO::getProjectNo).
                 selectAs(EquipPipeDO::getProjectName, PipeOrderItemPageRespVO::getEquipName).
                 selectAs(EquipPipeDO::getCertificateNo, PipeOrderItemPageRespVO::getUseRegisterNo).
@@ -171,9 +172,10 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
         if(StringUtils.isNotBlank(reqVO.getEquipCode())) {
             recordDOMPJLambdaWrapper.like(PipeTaskOrderItemDO::getEquipCode, reqVO.getEquipCode());
         }
-//        if(StringUtils.isNotBlank(reqVO.getProductNo())){
-//            recordDOMPJLambdaWrapper.like(EquipPipeDO::getProductNo, reqVO.getProductNo());
-//        }
+
+        if(reqVO.getEquipType() != null){
+            recordDOMPJLambdaWrapper.like(EquipPipeDO::getPipeCategory, reqVO.getEquipType());
+        }
 
         if (StringUtils.isNotBlank(reqVO.getCheckProject())) {
             recordDOMPJLambdaWrapper.like(PipeTaskOrderItemReportDO::getReportName, reqVO.getCheckProject());

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

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.pipetaskorder;
 
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import jakarta.validation.Valid;
 
 import java.util.List;
@@ -16,7 +17,7 @@ public interface PipeTaskOrderInspectionService {
 
     void batchInspectionOpinionSend(@Valid List<InspectionOpinionSendVo> inspectionOpinionSendVos);
 
-    List<OpinionReportedExcelExcelVO> opinionReportedExcel(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    List<OpinionReportedExcelExcelVO> opinionReportedExcel(@Valid PipeTaskOrderPageReqVO pageReqVO);
 
     /**
      * 检验意见通知书上报

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

@@ -258,7 +258,7 @@ public class PipeTaskOrderInspectionServiceImpl implements PipeTaskOrderInspecti
     }
 
     @Override
-    public List<OpinionReportedExcelExcelVO> opinionReportedExcel(BoilerTaskOrderPageReqVO pageReqVO) {
+    public List<OpinionReportedExcelExcelVO> opinionReportedExcel(PipeTaskOrderPageReqVO pageReqVO) {
         PageResult<PipeOrderItemPageRespVO> pageResult = pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
         List<OpinionReportedExcelExcelVO> list = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(pageResult) && CollUtil.isNotEmpty(pageResult.getList())) {

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

@@ -173,7 +173,7 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     List<PipeOrderItemProjectVO> getDetailByEquipId(PipeOrderItemProjectReqVO reqVO);
 
-    PageResult<PipeOrderItemPageRespVO> approveOpinionNoticePage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<PipeOrderItemPageRespVO> approveOpinionNoticePage(@Valid PipeTaskOrderPageReqVO pageReqVO);
 
     void orderConfirmFinish(OrderConfirmFinishVO orderItemRatifyVO);
 
@@ -193,7 +193,7 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     List<PipeEquipInfoVO> getEquipsByOrderId(String orderId);
 
-    PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO);
 
     Boolean generateInspectionPlan(MajorIssuesSubmitVO majorIssuesSubmitVO);
 

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

@@ -4478,7 +4478,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     }
 
     @Override
-    public PageResult<PipeOrderItemPageRespVO> approveOpinionNoticePage(BoilerTaskOrderPageReqVO pageReqVO) {
+    public PageResult<PipeOrderItemPageRespVO> approveOpinionNoticePage(PipeTaskOrderPageReqVO pageReqVO) {
 
         pageReqVO.setTaskStatusList(
                 Arrays.asList(
@@ -5033,7 +5033,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     }
 
     @Override
-    public PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {
+    public PageResult<PipeOrderItemPageRespVO> inspectionOpinionPage(PipeTaskOrderPageReqVO pageReqVO) {
         //构建查询参数
         PageResult<PipeOrderItemPageRespVO> orderItemPageRespVOPageResult = inspectionOpinionPageQueryParam(pageReqVO);
         if (Objects.nonNull(orderItemPageRespVOPageResult)) {
@@ -5356,7 +5356,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
     }
 
-    private PageResult<PipeOrderItemPageRespVO> inspectionOpinionPageQueryParam(BoilerTaskOrderPageReqVO pageReqVO) {
+    private PageResult<PipeOrderItemPageRespVO> inspectionOpinionPageQueryParam(PipeTaskOrderPageReqVO pageReqVO) {
         //根据平台用户id查询
         if (StringUtils.isNotEmpty(pageReqVO.getMemberId())) {
             LambdaQueryWrapperX<BusinessMemberRelationDO> queryRelationWrapperX = new LambdaQueryWrapperX<>();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportService.java

@@ -95,7 +95,7 @@ public interface PipeTaskOrderIssueReportService extends IService<PipeTaskOrderI
 
     void autoIssueTaskOrderReport(PipeTaskOrderDO taskOrderDO , List<PipeTaskOrderItemDO> taskOrderItemDOList);
 
-    PageResult<PipeOrderItemPageRespVO> orderItemReportConclusionPage(BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<PipeOrderItemPageRespVO> orderItemReportConclusionPage(PipeTaskOrderPageReqVO pageReqVO);
 
     PageResult<PipeTaskOrderRespVO> archivePage(@Valid PipeTaskOrderPageReqVO pageReqVO);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -1844,7 +1844,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     }
 
     @Override
-    public PageResult<PipeOrderItemPageRespVO> orderItemReportConclusionPage(BoilerTaskOrderPageReqVO pageReqVO) {
+    public PageResult<PipeOrderItemPageRespVO> orderItemReportConclusionPage(PipeTaskOrderPageReqVO pageReqVO) {
         pageReqVO.setInReportTypes(Lists.newArrayList(TaskOrderItemReportTypeEnum.MAIN_REPORT.getType(),
                 TaskOrderItemReportTypeEnum.SUB_REPORT.getType(),
                 TaskOrderItemReportTypeEnum.SOLO_TRIP_REPORT.getType()

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeAppTaskOrderItemReportService.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.service.pipetaskorderitemreport;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignRespVO;
@@ -25,7 +26,7 @@ public interface PipeAppTaskOrderItemReportService {
      * @param pageReqVO 分页请求（无unitCode时根据当前登录人memberId查询）
      * @return 分页结果
      */
-    PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(@Valid BoilerTaskOrderPageReqVO pageReqVO);
+    PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(@Valid PipeTaskOrderPageReqVO pageReqVO);
 
     /**
      * 检验意见通知书整改

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeAppTaskOrderItemReportServiceImpl.java

@@ -10,6 +10,7 @@ import cn.start.tz.framework.security.core.LoginUser;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignRespVO;
@@ -56,7 +57,7 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
     private RedissonClient redissonClient;
 
     @Override
-    public PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {
+    public PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(PipeTaskOrderPageReqVO pageReqVO) {
         // 不传单位code时根据当前登录人memberId查询
 //        if (StringUtils.isEmpty(pageReqVO.getUnitCode())) {
 //            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@@ -136,7 +137,7 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
 
     @Override
     public PipeOrderItemPageRespVO appInspectionOpinionById(String id) {
-        BoilerTaskOrderPageReqVO pageReqVO = new BoilerTaskOrderPageReqVO();
+        PipeTaskOrderPageReqVO pageReqVO = new PipeTaskOrderPageReqVO();
         pageReqVO.setId(id);
         PageResult<PipeOrderItemPageRespVO> result = appInspectionOpinionPage(pageReqVO);
         if (result != null && CollUtil.isNotEmpty(result.getList())) {