✨ feat(mes): 优化 cal plan 的代码实现

YunaiV
1 parent ccc3d1e4
Showing 2 changed files with 4 additions and 4 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/plan/vo/MesCalPlanPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/plan/MesCalPlanMapper.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;
 }
@@ -22,8 +22,8 @@ public interface MesCalPlanMapper extends BaseMapperX&lt;MesCalPlanDO&gt; {
                 .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));
     }