From 8dc993b81a51b8f88de0281c0932b78fdcd5af22 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Thu, 14 Jul 2022 09:02:00 +0800 Subject: [PATCH] zh --- .../controller/manage/TaskController.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index f4497d8..4a5e526 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -535,10 +535,18 @@ public class TaskController { if (null != param.getMonth()) { qw.between("t1.start", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now()); } else { - qw.ge(param.getBeginTime1() != null, "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime1().toLocalDate()); - qw.le(param.getBeginTime2() != null, "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime2().toLocalDate()); - qw.ge(param.getEndTime1() != null, "date_format(t1.end, '%Y-%m-%d')", param.getEndTime1().toLocalDate()); - qw.le(param.getEndTime2() != null, "date_format(t1.end, '%Y-%m-%d')", param.getEndTime2().toLocalDate()); + if(null !=param.getBeginTime1()){ + qw.ge("date_format(t1.start, '%Y-%m-%d')", param.getBeginTime1().toLocalDate()); + } + if(null !=param.getBeginTime2()){ + qw.le( "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime2().toLocalDate()); + } + if(null !=param.getEndTime1()){ + qw.ge( "date_format(t1.end, '%Y-%m-%d')", param.getEndTime1().toLocalDate()); + } + if(null !=param.getEndTime2()){ + qw.le( "date_format(t1.end, '%Y-%m-%d')", param.getEndTime2().toLocalDate()); + } } if (null != param.getKeyword()) { qw.like("t1.title", param.getKeyword());