mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-25 02:32:57 +08:00
fix:【FCJDFDXTXS-174】考试展示列表改为完成时间降序
This commit is contained in:
@@ -1284,6 +1284,20 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
// 获取当前课程的考试信息,并按lastTime字段倒序排列
|
||||
studyCourseItem.setStudyExams(studyExams.stream().filter(studyExam -> studyExam.getStudyItemId().equals(studyCourseItem.getId())).sorted(Comparator.comparing(StudyExam::getLastTime).reversed()).collect(Collectors.toList()));
|
||||
}
|
||||
// 25.12.17按照完成时间降序排列
|
||||
studyCourseItems.sort((item1, item2) -> {
|
||||
LocalDateTime time1 = item1.getFinishTime();
|
||||
LocalDateTime time2 = item2.getFinishTime();
|
||||
// 处理null值情况,将null值排在最后
|
||||
if (time1 == null && time2 == null) {
|
||||
return 0;
|
||||
} else if (time1 == null) {
|
||||
return 1;
|
||||
} else if (time2 == null) {
|
||||
return -1;
|
||||
}
|
||||
return time2.compareTo(time1);
|
||||
});
|
||||
}
|
||||
return success(rs);
|
||||
} catch (Exception e) {
|
||||
@@ -1336,7 +1350,7 @@ public class StudyCourseApi extends ApiBaseController{
|
||||
// 获取当前课程的评估信息
|
||||
studyCourseItem.setStudyAssesses(studyAssesses.stream().filter(studyAssess -> studyAssess.getStudyItemId().equals(studyCourseItem.getId())).collect(Collectors.toList()));
|
||||
}
|
||||
// 按照完成时间降序排列
|
||||
// 25.12.17按照完成时间降序排列
|
||||
studyCourseItems.sort((item1, item2) -> {
|
||||
LocalDateTime time1 = item1.getFinishTime();
|
||||
LocalDateTime time2 = item2.getFinishTime();
|
||||
|
||||
Reference in New Issue
Block a user