Ver Fonte

fix(mapper): 修复预约确认订单查询中的警告天数计算逻辑

- 添加了警告日期非空验证条件
- 将原来的CASE语句替换为GREATEST函数计算
- 修正了日期比较逻辑从预约日期减去警告日期改为警告日期减去当前日期
- 统一了两处相同的查询条件修改
xuzhancheng há 3 dias atrás
pai
commit
05cda060fb

+ 1 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskorder/vo/TaskOrderPushReqVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 public class TaskOrderPushReqVO {
 
     @Schema(description = "id")
-    @NotNull(message = "受理单id不能为空")
+    @NotNull(message = "任务单id不能为空")
     private String id;
 
 

+ 4 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/AppointmentConfirmOrderServiceImpl.java

@@ -305,6 +305,10 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
     @Override
     public PageResult<AppointmentConfirmOrderRespVO> getAppointmentConfirmOrderPage(AppointmentConfirmOrderPageReqVO pageReqVO){
         PageResult<AppointmentConfirmOrderRespVO> pageResult = new PageResult<>();
+        if (pageReqVO.getWarningDay() != null && pageReqVO.getWarningDay().length == 2){
+            pageReqVO.getWarningDay()[0] = pageReqVO.getWarningDay()[0] == null ? 0 : pageReqVO.getWarningDay()[0];
+            pageReqVO.getWarningDay()[1] = pageReqVO.getWarningDay()[1] == null ? 99999 : pageReqVO.getWarningDay()[1];
+        }
         List<AppointmentConfirmOrderRespVO> list = appointmentConfirmOrderMapper.selectPage(pageReqVO);
         pageResult.setTotal(appointmentConfirmOrderMapper.selectPageCount(pageReqVO));
         if (CollUtil.isNotEmpty(list)) {