|
@@ -122,9 +122,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
//老师默认的课酬
|
|
|
List<Integer> teacherUserIds = classGroupTeacherMapperList.stream().map(teacher -> teacher.getUserId()).collect(Collectors.toList());
|
|
|
List<TeacherDefaultMusicGroupSalary> teacherSalaryList = teacherDefaultMusicGroupSalaryDao.findByTeacher(teacherUserIds);
|
|
|
- Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> teacherDefaultSalary = new HashMap<>();
|
|
|
+ Map<String, TeacherDefaultMusicGroupSalary> teacherDefaultSalary = new HashMap<>();
|
|
|
if (teacherSalaryList.size() > 0) {
|
|
|
- teacherDefaultSalary = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
|
|
|
+ teacherDefaultSalary = teacherSalaryList.stream().collect(Collectors.toMap(teacherDefaultMusicGroupSalary->teacherDefaultMusicGroupSalary.getCourseScheduleType().getCode()+teacherDefaultMusicGroupSalary.getUserId(), teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
|
|
|
}
|
|
|
List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
|
|
|
String musicGroupId = classGroupTeacherMapperList.get(0).getMusicGroupId();
|
|
@@ -149,7 +149,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
|
|
|
TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(classGroupNoStartCourseSchedule.getType());
|
|
|
if (teacherDefaultMusicGroupSalary == null) {
|
|
|
- teacherDefaultMusicGroupSalary = teacherDefaultSalary.get(classGroupNoStartCourseSchedule.getType());
|
|
|
+ teacherDefaultMusicGroupSalary = teacherDefaultSalary.get(classGroupNoStartCourseSchedule.getType().getCode()+classGroupTeacherMapper.getUserId());
|
|
|
}
|
|
|
if (teacherDefaultMusicGroupSalary == null) {
|
|
|
throw new BizException("请先设置老师课酬");
|