|
@@ -1097,6 +1097,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
CourseSchedule courseSchedule = new CourseSchedule();
|
|
|
courseSchedule.setSchoolId(schoolId);
|
|
|
+ courseSchedule.setMusicGroupId(musicGroupId);
|
|
|
courseSchedule.setClassGroupId(classGroup.getId());
|
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|
|
|
courseSchedule.setClassDate(classDate);
|
|
@@ -1148,6 +1149,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
|
|
|
courseScheduleTeacherSalary.setExpectSalary(salary);
|
|
|
courseScheduleTeacherSalary.setClassGroupId(classGroup.getId());
|
|
|
+ courseScheduleTeacherSalary.setMusicGroupId(musicGroupId);
|
|
|
courseScheduleTeacherSalary.setCreateTime(date);
|
|
|
courseScheduleTeacherSalary.setUpdateTime(date);
|
|
|
courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
|
|
@@ -1155,6 +1157,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
for (StudentRegistration studentRegistration : studentList) {
|
|
|
CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
|
|
|
courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
|
|
|
+ courseScheduleStudentPayment.setMusicGroupId(musicGroupId);
|
|
|
courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
|
|
|
courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
|
|
|
courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
|
|
@@ -1485,6 +1488,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
CourseSchedule courseSchedule = new CourseSchedule();
|
|
|
courseSchedule.setSchoolId(schoolId);
|
|
|
+ courseSchedule.setMusicGroupId(musicGroupId);
|
|
|
courseSchedule.setClassGroupId(classGroup.getId());
|
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|
|
|
courseSchedule.setClassDate(classDate);
|
|
@@ -1531,6 +1535,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
|
|
|
courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
|
|
|
+ courseScheduleTeacherSalary.setMusicGroupId(musicGroupId);
|
|
|
courseScheduleTeacherSalary.setGroupType(courseSchedule.getGroupType());
|
|
|
courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
|
|
|
courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
|
|
@@ -1544,6 +1549,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
for (StudentRegistration studentRegistration : studentList) {
|
|
|
CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
|
|
|
courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
|
|
|
+ courseScheduleStudentPayment.setMusicGroupId(musicGroupId);
|
|
|
courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
|
|
|
courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
|
|
|
courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
|