|
|
@ -521,10 +521,10 @@ public class TaskController {
|
|
|
|
qw.eq("t1.status", param.getStatus());
|
|
|
|
qw.eq("t1.status", param.getStatus());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (null != param.getMonth()) {
|
|
|
|
if (null != param.getMonth()) {
|
|
|
|
qw.between("t1.creatAt", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now());
|
|
|
|
qw.between("t1.start", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime());
|
|
|
|
qw.ge(param.getBeginTime() != null, "t1.start", param.getBeginTime());
|
|
|
|
qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime());
|
|
|
|
qw.le(param.getEndTime() != null, "t1.start", param.getEndTime());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (null != param.getKeyword()) {
|
|
|
|
if (null != param.getKeyword()) {
|
|
|
|
qw.like("t1.title", param.getKeyword());
|
|
|
|
qw.like("t1.title", param.getKeyword());
|
|
|
|