diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java index 471cfea..b88ef25 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java @@ -34,10 +34,10 @@ public class MesCalPlanPageReqVO extends PageParam { @Schema(description = "开始日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime startDate; + private LocalDateTime[] startDate; @Schema(description = "结束日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime endDate; + private LocalDateTime[] endDate; } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java index a178ea7..d2cd4b7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.java @@ -22,8 +22,8 @@ public interface MesCalPlanMapper extends BaseMapperX { .eqIfPresent(MesCalPlanDO::getShiftType, reqVO.getShiftType()) .eqIfPresent(MesCalPlanDO::getStatus, reqVO.getStatus()) .eqIfPresent(MesCalPlanDO::getCalendarType, reqVO.getCalendarType()) - .geIfPresent(MesCalPlanDO::getStartDate, reqVO.getStartDate()) - .leIfPresent(MesCalPlanDO::getEndDate, reqVO.getEndDate()) + .betweenIfPresent(MesCalPlanDO::getStartDate, reqVO.getStartDate()) + .betweenIfPresent(MesCalPlanDO::getEndDate, reqVO.getEndDate()) .orderByDesc(MesCalPlanDO::getId)); }