PC端，受理单详情增加异常单信息

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/acceptorder/vo/AcceptOrderRespVO.java

@@ -2,7 +2,7 @@ package cn.start.tz.module.pressure2.controller.admin.acceptorder.vo;
 
 import cn.start.tz.module.bpm.api.task.dto.BpmTaskDTO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.TeamItemVO;
-import cn.start.tz.module.pressure2.controller.admin.orderexception.vo.OrderExceptionRespVO;
+import cn.start.tz.module.pressure2.controller.admin.boilerorderexception.vo.BoilerOrderExceptionRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
@@ -267,7 +267,7 @@ public class AcceptOrderRespVO {
     private String recipientEmail;
 
     @Schema(description ="约检确认单异常信息")
-    private OrderExceptionRespVO orderExceptionRespVO;
+    private BoilerOrderExceptionRespVO orderExceptionRespVO;
 
     /**
      * 缴费联系人名称

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/acceptorder/vo/PipeAcceptOrderRespVO.java

@@ -2,7 +2,7 @@ package cn.start.tz.module.pressure2.controller.admin.acceptorder.vo;
 
 import cn.start.tz.module.bpm.api.task.dto.BpmTaskDTO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.TeamItemVO;
-import cn.start.tz.module.pressure2.controller.admin.orderexception.vo.OrderExceptionRespVO;
+import cn.start.tz.module.pressure2.controller.admin.pipeorderexception.vo.PipeOrderExceptionRespVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
@@ -267,7 +267,7 @@ public class PipeAcceptOrderRespVO {
     private String recipientEmail;
 
     @Schema(description ="约检确认单异常信息")
-    private OrderExceptionRespVO orderExceptionRespVO;
+    private PipeOrderExceptionRespVO orderExceptionRespVO;
 
     /**
      * 缴费联系人名称

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/AcceptOrderServiceImpl.java

@@ -9,6 +9,7 @@ import cn.start.tz.framework.common.exception.ErrorCode;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.security.core.LoginUser;
+import cn.start.tz.module.pressure2.controller.admin.boilerorderexception.vo.BoilerOrderExceptionRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderRespVO;
 import cn.start.tz.module.pressure2.controller.app.acceptorder.vo.AcceptOrderAppRespVO;
@@ -258,6 +259,16 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             orderRespVO.setEquipDistrictName(area.getName());
         }
 
+        LambdaQueryWrapperX<BoilerOrderExceptionDO> queryOrderException = new LambdaQueryWrapperX<>();
+        queryOrderException.eq(BoilerOrderExceptionDO::getOrderType, 200);
+        queryOrderException.eq(BoilerOrderExceptionDO::getOrderId, id);
+        List<BoilerOrderExceptionDO> orderExceptionDOS = orderExceptionMapper.selectList(queryOrderException);
+        if (CollUtil.isNotEmpty(orderExceptionDOS)) {
+            BoilerOrderExceptionRespVO orderExceptionRespVO = new BoilerOrderExceptionRespVO();
+            BeanUtils.copyProperties(orderExceptionDOS.get(0), orderExceptionRespVO);
+            orderRespVO.setOrderExceptionRespVO(orderExceptionRespVO);
+        }
+
         return orderRespVO;
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -8,6 +8,7 @@ import cn.start.tz.framework.common.exception.ErrorCode;
 import cn.start.tz.framework.common.pojo.PageResult;
 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.pipeorderexception.vo.PipeOrderExceptionRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderRespVO;
 import cn.start.tz.module.pressure2.controller.app.acceptorder.vo.AcceptOrderAppRespVO;
@@ -256,6 +257,16 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             orderRespVO.setEquipDistrictName(area.getName());
         }
 
+        LambdaQueryWrapperX<PipeOrderExceptionDO> queryOrderException = new LambdaQueryWrapperX<>();
+        queryOrderException.eq(PipeOrderExceptionDO::getOrderType, 200);
+        queryOrderException.eq(PipeOrderExceptionDO::getOrderId, id);
+        List<PipeOrderExceptionDO> orderExceptionDOS = pipeOrderExceptionMapper.selectList(queryOrderException);
+        if (CollUtil.isNotEmpty(orderExceptionDOS)) {
+            PipeOrderExceptionRespVO orderExceptionRespVO = new PipeOrderExceptionRespVO();
+            BeanUtils.copyProperties(orderExceptionDOS.get(0), orderExceptionRespVO);
+            orderRespVO.setOrderExceptionRespVO(orderExceptionRespVO);
+        }
+
         return orderRespVO;
     }