|
@@ -376,7 +376,11 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
|
|
|
LocalDate startDay = LocalDate.now().plusDays(1);
|
|
|
LocalDate endDay = startDay.plusDays(14);
|
|
|
|
|
|
- Map<Integer, List<String>> weekNumApplyTimesMap = eduPracticeGroupService.getEnableApplyDatesWithWeek(startDay.getDayOfWeek().getValue());
|
|
|
+ LocalDate monday = startDay.with(weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
|
|
|
+ LocalDate sunday = endDay.with(weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
|
|
|
+
|
|
|
+
|
|
|
+ Map<Integer, List<String>> weekNumApplyTimesMap = eduPracticeGroupService.getEnableApplyDatesWithWeek(monday.getDayOfWeek().getValue());
|
|
|
List<CourseSchedule> allTeacherCourses = courseScheduleDao.findTeacherCoursesWithDateRange(teacherId, Date.from(startDay.atStartOfDay(zoneId).toInstant()), Date.from(endDay.atStartOfDay(zoneId).toInstant()));
|
|
|
allTeacherCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
|