|
|
@@ -2590,8 +2590,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
int newMinutes = DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime());
|
|
|
|
|
|
// 如果修改了老师、课程类型、课程时长、教学模式，需要修改课酬
|
|
|
-// if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
|
|
|
-// || newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
|
|
|
+ if (VIP.equals(newCourseSchedule.getGroupType())||!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
|
|
|
+ || newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
|
|
|
|
|
|
Map<Integer, Teacher> teacherMap = null;
|
|
|
Map<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>> musicGroupSalaryMap = new HashMap<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>>();
|
|
|
@@ -2752,7 +2752,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
insertCourseScheduleTeacherSalaryList.add(ts);
|
|
|
}
|
|
|
-// }
|
|
|
+ }
|
|
|
|
|
|
// 调整日志
|
|
|
CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
|
Joburgess