|
|
@ -69,6 +69,22 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService { |
|
|
queryWrapper.in(TaskEntity::getSubLineId, productLineEntityList); |
|
|
queryWrapper.in(TaskEntity::getSubLineId, productLineEntityList); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
// 考试状态过滤
|
|
|
|
|
|
Date endOfToday = DateUtil.endOfDay(new Date()); |
|
|
|
|
|
Date beginOfToday = DateUtil.beginOfDay(new Date()); |
|
|
|
|
|
// 待开考:开始时间大于当前
|
|
|
|
|
|
if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.Not_Start.name())) { |
|
|
|
|
|
queryWrapper.gt(TaskEntity::getStartTime, endOfToday); |
|
|
|
|
|
} |
|
|
|
|
|
// 已截止:结束时间小于当前
|
|
|
|
|
|
if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.Cut_Off.name())) { |
|
|
|
|
|
queryWrapper.lt(TaskEntity::getEndTime, beginOfToday); |
|
|
|
|
|
} |
|
|
|
|
|
// 已开考
|
|
|
|
|
|
if (StrUtil.equals(param.getTaskStatus(), TaskStatusEnum.In_Progress.name())) { |
|
|
|
|
|
queryWrapper.le(TaskEntity::getStartTime, endOfToday); |
|
|
|
|
|
queryWrapper.ge(TaskEntity::getEndTime, beginOfToday); |
|
|
|
|
|
} |
|
|
queryWrapper.orderByDesc(TaskEntity::getId); |
|
|
queryWrapper.orderByDesc(TaskEntity::getId); |
|
|
IPage<TaskEntity> taskEntityPage = taskMapper.selectPage( |
|
|
IPage<TaskEntity> taskEntityPage = taskMapper.selectPage( |
|
|
PageConverter.toMpPage(param), |
|
|
PageConverter.toMpPage(param), |
|
|
|