|
@@ -2987,6 +2987,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
//老师结算表
|
|
|
if (courseScheduleTeacherSalaries.size() > 0) {
|
|
|
+ teacherAttendanceDao.batchDeleteByCourseSchedules(courseAdjustInfo.getCourseScheduleIds());
|
|
|
courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaries);
|
|
|
}
|
|
|
|
|
@@ -3534,6 +3535,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Map<Integer, Map<Integer, TeacherDefaultVipGroupSalary>> vipGroupSalaryMap = new HashMap<Integer, Map<Integer, TeacherDefaultVipGroupSalary>>();
|
|
|
|
|
|
if (newCourseSchedule.getGroupType() == GroupType.MUSIC) {
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(newCourseSchedule.getMusicGroupId());
|
|
|
+ if(Objects.isNull(musicGroup)||!MusicGroupStatusEnum.PROGRESS.equals(musicGroup.getStatus())){
|
|
|
+ throw new BizException("非进行中乐团不可调整课程");
|
|
|
+ }
|
|
|
// 所有教师列表
|
|
|
List<Teacher> teachers = teacherDao.findByTeacherIds(newTeacherIdList);
|
|
|
teacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, teacher -> teacher));
|