查询条件调整

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

@@ -431,4 +431,7 @@ public class BoilerTaskOrderPageReqVO extends PageParam {
     private String nonTaxApplyStatus;
 
     private String acceptUserId;
+
+    @Schema(description = "是否已超期")
+    private Boolean isOverdue;
 }

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

@@ -434,4 +434,7 @@ public class PipeTaskOrderPageReqVO extends PageParam {
     private String nonTaxApplyStatus;
 
     private String acceptUserId;
+
+    @Schema(description = "是否已超期")
+    private Boolean isOverdue;
 }

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

@@ -27,6 +27,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemuser.PipeTas
 import com.alibaba.cloud.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -319,6 +320,34 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
             recordDOMPJLambdaWrapper.notIn(BoilerTaskOrderItemReportDO::getTaskStatus, reqVO.getNotTaskStatusList());
         }
 
+        // 超期查询：根据客户剩余确认时间与当前时间比较
+        if(reqVO.getIsOverdue() != null){
+            if(reqVO.getIsOverdue()){
+                recordDOMPJLambdaWrapper.lt(BoilerTaskOrderItemReportDO::getConfirmationTime, LocalDate.now());
+            } else {
+                // 查询未超期的记录：确认时间大于当前时间
+                recordDOMPJLambdaWrapper.ge(BoilerTaskOrderItemReportDO::getConfirmationTime, LocalDate.now());
+            }
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getHandlerId())){
+            String tmp = "JSON_CONTAINS(t6.HANDLER_ID, '\"" + reqVO.getHandlerId() + "\"')";
+            recordDOMPJLambdaWrapper.apply(tmp);
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getReporterId())){
+            String tmp = "JSON_CONTAINS(t6.REPORTER_ID, '\"" + reqVO.getReporterId() + "\"')";
+            recordDOMPJLambdaWrapper.apply(tmp);
+        }
+
+        if (CollUtil.isNotEmpty(reqVO.getMpSendStatusList())) {
+            recordDOMPJLambdaWrapper.in(BoilerTaskOrderItemReportDO::getMpSendStatus, reqVO.getMpSendStatusList());
+        }
+
+        if (reqVO.getEquipDistrict() != null) {
+            recordDOMPJLambdaWrapper.eq(EquipBoilerDO::getEquipDistrict, reqVO.getEquipDistrict());
+        }
+
         return selectJoinPage(reqVO, BoilerOrderItemPageRespVO.class, recordDOMPJLambdaWrapper);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem;
 
+import java.time.LocalDate;
 import java.util.*;
 
 import cn.hutool.core.collection.CollUtil;
@@ -328,6 +329,34 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
             recordDOMPJLambdaWrapper.notIn(PipeTaskOrderItemReportDO::getTaskStatus, reqVO.getNotTaskStatusList());
         }
 
+        // 超期查询：根据客户剩余确认时间与当前时间比较
+        if(reqVO.getIsOverdue() != null){
+            if(reqVO.getIsOverdue()){
+                recordDOMPJLambdaWrapper.lt(PipeTaskOrderItemReportDO::getConfirmationTime, LocalDate.now());
+            } else {
+                // 查询未超期的记录：确认时间大于当前时间
+                recordDOMPJLambdaWrapper.ge(PipeTaskOrderItemReportDO::getConfirmationTime, LocalDate.now());
+            }
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getHandlerId())){
+            String tmp = "JSON_CONTAINS(t6.HANDLER_ID, '\"" + reqVO.getHandlerId() + "\"')";
+            recordDOMPJLambdaWrapper.apply(tmp);
+        }
+
+        if(StringUtils.isNotBlank(reqVO.getReporterId())){
+            String tmp = "JSON_CONTAINS(t6.REPORTER_ID, '\"" + reqVO.getReporterId() + "\"')";
+            recordDOMPJLambdaWrapper.apply(tmp);
+        }
+
+        if (CollUtil.isNotEmpty(reqVO.getMpSendStatusList())) {
+            recordDOMPJLambdaWrapper.in(PipeTaskOrderItemReportDO::getMpSendStatus, reqVO.getMpSendStatusList());
+        }
+
+        if (reqVO.getEquipDistrict() != null) {
+            recordDOMPJLambdaWrapper.eq(EquipPipeDO::getEquipDistrict, reqVO.getEquipDistrict());
+        }
+
         return selectJoinPage(reqVO, PipeOrderItemPageRespVO.class, recordDOMPJLambdaWrapper);
     }