zh

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());
+            if(null !=param.getBeginTime1()){
-            qw.le(param.getBeginTime2() != null, "date_format(t1.start, '%Y-%m-%d')", param.getBeginTime2().toLocalDate());
+                qw.ge("date_format(t1.start, '%Y-%m-%d')", param.getBeginTime1().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.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());