|
@@ -155,11 +155,12 @@ public class ExamServiceImpl implements ExamService {
|
|
|
User student = userDao.findById(id).orElse(null);
|
|
User student = userDao.findById(id).orElse(null);
|
|
|
if (student != null) {
|
|
if (student != null) {
|
|
|
List<Exam> exams = student.getExams();
|
|
List<Exam> exams = student.getExams();
|
|
|
|
|
+
|
|
|
return new ExamListAndNumVO(
|
|
return new ExamListAndNumVO(
|
|
|
exams.stream().sorted(Comparator.comparing(Exam::getStartTime).reversed())
|
|
exams.stream().sorted(Comparator.comparing(Exam::getStartTime).reversed())
|
|
|
.filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state)
|
|
.filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state)
|
|
|
.skip(pageSize * (pageNum - 1)).limit(pageSize)
|
|
.skip(pageSize * (pageNum - 1)).limit(pageSize)
|
|
|
- .map(ExamConvertor::convertToVO).collect(Collectors.toList()),
|
|
|
|
|
|
|
+ .map(ExamConvertor::convertToJoinedVO).collect(Collectors.toList()),
|
|
|
//输出总个数,用于前端分页
|
|
//输出总个数,用于前端分页
|
|
|
(int) exams.stream().filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state).count());
|
|
(int) exams.stream().filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state).count());
|
|
|
} else {
|
|
} else {
|