|
|
|
@ -83,6 +83,9 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { |
|
|
|
queryWrapper.in(TaskEntity::getSubLineId, productLineEntityList); |
|
|
|
} |
|
|
|
} |
|
|
|
if (Objects.nonNull(param.getClassicCategoryId())) { |
|
|
|
queryWrapper.eq(TaskEntity::getClassicCategoryId, param.getClassicCategoryId()); |
|
|
|
} |
|
|
|
// 考试状态过滤
|
|
|
|
Date endOfToday = DateUtil.endOfDay(new Date()); |
|
|
|
Date beginOfToday = DateUtil.beginOfDay(new Date()); |
|
|
|
@ -99,11 +102,6 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { |
|
|
|
queryWrapper.le(TaskEntity::getStartTime, endOfToday); |
|
|
|
queryWrapper.ge(TaskEntity::getEndTime, beginOfToday); |
|
|
|
} |
|
|
|
if (BooleanUtil.isTrue(param.getExcludeEnd())) { |
|
|
|
// 强制要求:结束时间必须 >= 今天 00:00:00
|
|
|
|
// 这样,截止时间是今天的任务会被【保留】,只有昨天及以前截止的任务会被【排除】
|
|
|
|
queryWrapper.ge(TaskEntity::getEndTime, beginOfToday); |
|
|
|
} |
|
|
|
queryWrapper.orderByDesc(TaskEntity::getId); |
|
|
|
IPage<TaskEntity> taskEntityPage = taskMapper.selectPage( |
|
|
|
PageConverter.toMpPage(param), |
|
|
|
|