|
@@ -410,12 +410,8 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
|
|
|
|
|
|
TeacherFreeTime teacherFreeTime = teacherFreeTimeDao.findTeacherFreeTime(teacherId);
|
|
|
JSONObject teacherFreeTimes=new JSONObject();
|
|
|
- Integer maxTeacherCourses = null;
|
|
|
int holiday = 0;
|
|
|
if (Objects.nonNull(teacherFreeTime)) {
|
|
|
- if (Objects.nonNull(teacherFreeTime.getTotalTimes())) {
|
|
|
- maxTeacherCourses = teacherFreeTime.getTotalTimes();
|
|
|
- }
|
|
|
if (Objects.nonNull(teacherFreeTime.getHoliday())) {
|
|
|
holiday = DateUtil.normalWeekNumCalendarWeekNumMap.get(teacherFreeTime.getHoliday());
|
|
|
}
|
|
@@ -478,31 +474,12 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
|
|
|
allTeacherCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
|
|
|
List<CourseSchedule> applyDateRangeCourses = new ArrayList<>();
|
|
|
- Calendar courseCalendar = Calendar.getInstance();
|
|
|
- courseCalendar.setFirstDayOfWeek(Calendar.MONDAY);
|
|
|
- int courseWeekNum = 0;
|
|
|
- int practiceCourseNum = 0;
|
|
|
for (int i = 0; i < allTeacherCourses.size(); i++) {
|
|
|
CourseSchedule teacherCourse = allTeacherCourses.get(i);
|
|
|
if ((!teacherCourse.getClassDate().before(applyStartDate))
|
|
|
&& (teacherCourse.getClassDate().before(applyEndDate) || DateUtil.isSameDay(teacherCourse.getClassDate(), applyEndDate))) {
|
|
|
applyDateRangeCourses.add(teacherCourse);
|
|
|
}
|
|
|
- courseCalendar.setTime(teacherCourse.getClassDate());
|
|
|
- if (i == 0 && teacherCourse.getGroupType().equals(GroupType.PRACTICE)) {
|
|
|
- practiceCourseNum += 1;
|
|
|
- courseWeekNum = courseCalendar.get(Calendar.WEEK_OF_YEAR);
|
|
|
- }
|
|
|
- if (Objects.nonNull(maxTeacherCourses) && practiceCourseNum >= maxTeacherCourses) {
|
|
|
- disableApplyWeekNum.add(courseWeekNum);
|
|
|
- }
|
|
|
- if (courseCalendar.get(Calendar.WEEK_OF_YEAR) != courseWeekNum) {
|
|
|
- courseWeekNum = courseCalendar.get(Calendar.WEEK_OF_YEAR);
|
|
|
- practiceCourseNum = 0;
|
|
|
- }
|
|
|
- if (teacherCourse.getGroupType().equals(GroupType.PRACTICE)) {
|
|
|
- practiceCourseNum += 1;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
JSONObject teacherLeaveData = null;
|