|
@@ -3910,13 +3910,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
Map<CourseSchedule.CourseScheduleType, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(TeacherDefaultMusicGroupSalary::getCourseScheduleType, teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
|
|
|
TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
|
|
|
|
- int studentNum = classGroup.getStudentNum() + 1;
|
|
|
- if (classGroup.getType().equals(HIGH_ONLINE) && studentNum > 5) {
|
|
|
- studentNum = 5;
|
|
|
+ if (classGroup.getType().equals(HIGH_ONLINE) && aLong > 5l) {
|
|
|
+ aLong = 5l;
|
|
|
}
|
|
|
BigDecimal salary = null;
|
|
|
if(classGroup.getType().equals(HIGH_ONLINE)){
|
|
|
- salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum + "");
|
|
|
+ salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(aLong + "");
|
|
|
}else if(classGroup.getType().equals(HIGH)){
|
|
|
MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
|
|
|
TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalaryHigh = collect.get(CourseSchedule.CourseScheduleType.HIGH);
|
|
@@ -3927,7 +3926,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
|
|
|
salary = TeachTypeEnum.BISHOP.equals(classGroupTeacher.getTeacherRole()) ? teacherDefaultMusicGroupSalaryHigh.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalaryHigh.getAssistantTeacher90MinSalary();
|
|
|
}
|
|
|
- salary = salary.multiply(new BigDecimal(studentNum));
|
|
|
+ salary = salary.multiply(new BigDecimal(aLong));
|
|
|
}
|
|
|
if(Objects.isNull(salary)){
|
|
|
throw new BizException("请设置老师课酬");
|