userclass/UserclassService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

学年

Browse Source
This commit is contained in:
wanghu
2026-08-25 12:19:01 +08:00
parent 503cbdf3f8
commit a49c28b5b2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yunhai/bschclassmanage/service/impl/BaseYearTermService.java
+5 -3
View File
@@ -62,10 +62,12 @@ public class BaseYearTermService implements IBaseYearTermService {
public BaseYearTerm getNowYearTerm() { public BaseYearTerm getNowYearTerm() {
Date now = new Date(); Date now = new Date();
List<BaseYearTerm> yearTermList = getAllYearTerm(); List<BaseYearTerm> yearTermList = getAllYearTerm();
// 当前学期开始时间 <= now < 下一学期开始时间：按开始时间倒序后，取第一个已开始（开始时间<=now）的学期
return yearTermList.stream() return yearTermList.stream()
.filter(s -> s.getYearStartDate().compareTo(now) <= 0 && s.getYearEndDate().compareTo(now) >= 0) .sorted(Comparator.comparing(BaseYearTerm::getYearStartDate).reversed())
.findFirst().orElse(null); .filter(s -> s.getYearStartDate().compareTo(now) <= 0)
// .orElseThrow(() -> new DException("获取学年失败，当前时间不在当学年时间范围")); .findFirst()
.orElseThrow(() -> new DException("获取学年失败，当前时间不在当学年时间范围"));
} }