|
@@ -6023,15 +6023,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
LocalDate currentWeekStart = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
|
|
|
DateTimeFormatter format = DateTimeFormatter.ofPattern("MM月dd日");
|
|
|
StringBuffer sb;
|
|
|
+ StringBuffer sb1;
|
|
|
int week = 0;
|
|
|
while (!currentWeekStart.isAfter(endDate)) {
|
|
|
DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto vo =
|
|
|
new DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto();
|
|
|
String weekStart = currentWeekStart.format(format);
|
|
|
- sb = new StringBuffer("第").append(toChineseNumber(week)).append("周 (").append(weekStart).append("-");
|
|
|
+ sb = new StringBuffer("第").append(toChineseNumber(week)).append("周");
|
|
|
LocalDate currentWeekEnd = currentWeekStart.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
|
|
|
String endStart = currentWeekEnd.format(format);
|
|
|
- sb.append(endStart).append(")");
|
|
|
+ sb1 = new StringBuffer("(").append(weekStart).append("-").append(endStart).append(")");
|
|
|
// 判断课程状态
|
|
|
String courseStatus;
|
|
|
if (currentWeekEnd.isBefore(now)) {
|
|
@@ -6051,6 +6052,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
week++;
|
|
|
currentWeekStart = currentWeekEnd.plusDays(1);
|
|
|
vo.setWeek(sb.toString());
|
|
|
+ vo.setWeekTime(sb1.toString());
|
|
|
vo.setDailySummaryOfClassesForTheCurrentSemesterDtos(currentWeekDates);
|
|
|
result.add(vo);
|
|
|
}
|