优化时间查询问题

王富生
1 parent 0e964aec
Showing 2 changed files with 18 additions and 6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java
@@ -10,6 +10,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 @Schema(description = "管理后台 - 巡检计划分页 Request VO")
@@ -39,12 +40,12 @@ public class InspectionPlanDetailPageReqVO extends PageParam {
     private Integer sortNum;
     @Schema(description = "执行开始时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDate[] beginTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate beginTime;
     @Schema(description = "执行时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDate[] endTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate endTime;
     @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成")
     private Integer finishState;
 package com.zteits.urbanops.module.garden.dal.mysql.inspectionplan;
+import java.time.LocalDateTime;
 import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -19,6 +20,14 @@ import org.apache.ibatis.annotations.Param;
 public interface InspectionPlanDetailMapper extends BaseMapperX<InspectionPlanDetailDO> {
     default PageResult<InspectionPlanDetailDO> selectPage(InspectionPlanDetailPageReqVO reqVO) {
+        LocalDateTime startTime = null;
+        LocalDateTime endTime = null;
+        if(reqVO.getBeginTime() != null){
+            startTime = reqVO.getBeginTime().atStartOfDay();
+        }
+        if(reqVO.getEndTime() != null){
+            endTime = reqVO.getEndTime().atTime(23, 59, 59);
+        }
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDetailDO>()
                 .eqIfPresent(InspectionPlanDetailDO::getBatchNo, reqVO.getBatchNo())
                 .eqIfPresent(InspectionPlanDetailDO::getPlanNo, reqVO.getPlanNo())
@@ -27,8 +36,10 @@ public interface InspectionPlanDetailMapper extends BaseMapperX&lt;InspectionPlanDe
                 .eqIfPresent(InspectionPlanDetailDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(InspectionPlanDetailDO::getRoadId, reqVO.getRoadId())
                 .eqIfPresent(InspectionPlanDetailDO::getSortNum, reqVO.getSortNum())
-                .betweenIfPresent(InspectionPlanDetailDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
-                .eqIfPresent(InspectionPlanDetailDO::getFinishState, reqVO.getFinishState())
+                // >=
+                .ge(reqVO.getBeginTime() != null, InspectionPlanDetailDO::getBeginTime, startTime)
+                // <=
+                .le(reqVO.getEndTime()!= null, InspectionPlanDetailDO::getEndTime, endTime)
                 .eq(InspectionPlanDetailDO::getDeleted,0)
                 .orderByAsc(InspectionPlanDetailDO::getId));
     }