机械费用增加开始时间和结束时间筛选

wangqian
1 parent df20c5d5
Showing 4 changed files with 8 additions and 44 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/mechanicalcost/MechanicalCostMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java
@@ -51,7 +51,7 @@ public class MechanicalCostPageReqVO extends PageParam {
     @Schema(description = "开始使用时间")
     @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate startUseTime;
+    private LocalDate[] startUseTime;
     @Schema(description = "使用年限")
     private Long serviceLife;
@@ -59,7 +59,7 @@ public class MechanicalCostPageReqVO extends PageParam {
     @Schema(description = "结束使用时间")
     @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate endUseTime;
+    private LocalDate[] endUseTime;
     @Schema(description = "归属公司", example = "张三")
     private String companyName;
@@ -86,22 +86,4 @@ public class MechanicalCostPageReqVO extends PageParam {
             "endUseTime" , MechanicalCostDO::getEndUseTime
     );
-    @AssertTrue(message = "结束时间不能小于开始时间")
-    @Schema(hidden = true)
-    public boolean isStartTimeNotAfterEndTime() {
-        // 1. 两个时间都为空：校验通过（分页查询条件可选）
-        if (startUseTime == null && endUseTime == null) {
-            return true;
-        }
-        // 2. 仅开始时间为空：校验通过（可根据业务调整为false强制要求）
-        if (startUseTime == null) {
-            return true;
-        }
-        // 3. 仅结束时间为空：校验通过（分页查询条件可选）
-        if (endUseTime == null) {
-            return true;
-        }
-        // 4. 两个时间都不为空：核心判断 - 开始时间 <= 结束时间
-        return !startUseTime.isAfter(endUseTime);
-    }
 }
@@ -29,7 +29,7 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     @Schema(description = "开始使用时间")
     @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate startUseTime;
+    private LocalDate[] startUseTime;
     @Schema(description = "使用时长（天）")
     private Integer useDuration;
@@ -37,7 +37,7 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     @Schema(description = "结束日期")
     @JsonFormat(pattern = "yyyy-MM-dd", shape = JsonFormat.Shape.STRING)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate endUseTime;
+    private LocalDate[] endUseTime;
     @Schema(description = "数量")
     private Integer quantity;
@@ -54,22 +54,4 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
             "endUseTime", RentalMechanicalCostDO::getEndUseTime
     );
-    @AssertTrue(message = "结束时间不能小于开始时间")
-    @Schema(hidden = true)
-    public boolean isStartTimeNotAfterEndTime() {
-        // 1. 两个时间都为空：校验通过（分页查询条件可选）
-        if (startUseTime == null && endUseTime == null) {
-            return true;
-        }
-        // 2. 仅开始时间为空：校验通过（可根据业务调整为false强制要求）
-        if (startUseTime == null) {
-            return true;
-        }
-        // 3. 仅结束时间为空：校验通过（分页查询条件可选）
-        if (endUseTime == null) {
-            return true;
-        }
-        // 4. 两个时间都不为空：核心判断 - 开始时间 <= 结束时间
-        return !startUseTime.isAfter(endUseTime);
-    }
 }
@@ -29,9 +29,9 @@ public interface MechanicalCostMapper extends BaseMapperX&lt;MechanicalCostDO&gt; {
                 .eqIfPresent(MechanicalCostDO::getLicensePlate, reqVO.getLicensePlate())
                 .eqIfPresent(MechanicalCostDO::getVehicleCategory, reqVO.getVehicleCategory())
                 .eqIfPresent(MechanicalCostDO::getVehicleType, reqVO.getVehicleType())
-                .geIfPresent(MechanicalCostDO::getStartUseTime, reqVO.getStartUseTime())
+                .betweenIfPresent(MechanicalCostDO::getStartUseTime, reqVO.getStartUseTime())
                 .eqIfPresent(MechanicalCostDO::getServiceLife, reqVO.getServiceLife())
-                .leIfPresent(MechanicalCostDO::getEndUseTime, reqVO.getEndUseTime())
+                .betweenIfPresent(MechanicalCostDO::getEndUseTime, reqVO.getEndUseTime())
                 .likeIfPresent(MechanicalCostDO::getCompanyName, reqVO.getCompanyName())
                 .eqIfPresent(MechanicalCostDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(MechanicalCostDO::getDeptId, reqVO.getDeptId())
@@ -28,9 +28,9 @@ public interface RentalMechanicalCostMapper extends BaseMapperX&lt;RentalMechanical
                 //.eqIfPresent(RentalMechanicalCostDO::getVehicleCategory, reqVO.getVehicleCategory())
                // .eqIfPresent(RentalMechanicalCostDO::getVehicleType, reqVO.getVehicleType())
                 //.betweenIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime())
-                .geIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime())
+                .betweenIfPresent(RentalMechanicalCostDO::getStartUseTime, reqVO.getStartUseTime())
                 .eqIfPresent(RentalMechanicalCostDO::getUseDuration, reqVO.getUseDuration())
-                .leIfPresent(RentalMechanicalCostDO::getEndUseTime, reqVO.getEndUseTime())
+                .betweenIfPresent(RentalMechanicalCostDO::getEndUseTime, reqVO.getEndUseTime())
                 //.likeIfPresent(RentalMechanicalCostDO::getCompanyName, reqVO.getCompanyName())
                 .eqIfPresent(RentalMechanicalCostDO::getCompanyId, reqVO.getCompanyId())
                 //.eqIfPresent(RentalMechanicalCostDO::getDeptId, reqVO.getDeptId())