|
@@ -657,6 +657,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
teacherDefaultMusicGroupSalary.setCourseScheduleType(CourseSchedule.getCourseScheduleTypeByCode(courseType));
|
|
|
teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
|
|
|
}
|
|
|
+ for (TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary : teacherSalaryByUserIdAndType) {
|
|
|
+ if(teacherDefaultMusicGroupSalary.getCourseScheduleType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) && teacherDefaultMusicGroupSalary.getSalaryRuleJson() != null){
|
|
|
+ Integer studentNum = classGroupService.get(classGroupTeacherMapper.getClassGroupId()).getExpectStudentNum();
|
|
|
+ BigDecimal salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
|
+ teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(salary);
|
|
|
+ teacherDefaultMusicGroupSalary.setMainTeacher90MinSalary(salary);
|
|
|
+ }
|
|
|
+ }
|
|
|
classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
|
|
|
}
|
|
|
|