|
@@ -6018,9 +6018,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
LocalDate startDate = LocalDate.parse(startTerm, formatter);
|
|
|
LocalDate endDate = LocalDate.parse(endTerm, formatter);
|
|
|
+ LocalDate now = LocalDate.now();
|
|
|
List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto> result = new ArrayList<>();
|
|
|
LocalDate currentWeekStart = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
|
|
|
- DateTimeFormatter format = DateTimeFormatter.ofPattern("yy年MM月dd日");
|
|
|
+ DateTimeFormatter format = DateTimeFormatter.ofPattern("MM月dd日");
|
|
|
StringBuffer sb;
|
|
|
int week = 0;
|
|
|
while (!currentWeekStart.isAfter(endDate)) {
|
|
@@ -6031,6 +6032,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
LocalDate currentWeekEnd = currentWeekStart.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
|
|
|
String endStart = currentWeekEnd.format(format);
|
|
|
sb.append(endStart).append(")");
|
|
|
+ // 判断课程状态
|
|
|
+ String courseStatus;
|
|
|
+ if (currentWeekEnd.isBefore(now)) {
|
|
|
+ courseStatus = "END";
|
|
|
+ } else if (currentWeekStart.isAfter(now)) {
|
|
|
+ courseStatus = "NOT_START";
|
|
|
+ } else {
|
|
|
+ courseStatus = "ING";
|
|
|
+ }
|
|
|
+ vo.setCourseStatus(courseStatus);
|
|
|
List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto> currentWeekDates = new ArrayList<>();
|
|
|
for (DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto dto : summary) {
|
|
|
if (!dto.getCourseDate().isBefore(currentWeekStart) && dto.getCourseDate().isBefore(currentWeekEnd)) {
|