|
@@ -1926,10 +1926,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
- if (studentNum < 3 || studentNum > 5) {
|
|
|
|
- String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
- throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
- }
|
|
|
|
|
|
+// if (studentNum < 3 || studentNum > 5) {
|
|
|
|
+// String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
+// throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
+// }
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2229,10 +2229,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
- if (studentNum < 3 || studentNum > 5) {
|
|
|
|
- String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
- throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
- }
|
|
|
|
|
|
+// if (studentNum < 3 || studentNum > 5) {
|
|
|
|
+// String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
+// throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
+// }
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2515,10 +2515,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)||classGroup4MixDto.getCourseType().equals(CourseScheduleType.HIGH)) {
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
teacherDefaultMusicGroupSalary = collect.get(CourseSchedule.CourseScheduleType.HIGH_ONLINE);
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupTeacherMapper.getClassGroupId());
|
|
- if (studentNum < 3 || studentNum > 5) {
|
|
|
|
- String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
- throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
- }
|
|
|
|
|
|
+// if (studentNum < 3 || studentNum > 5) {
|
|
|
|
+// String numWaring = studentNum < 3 ? "人数不能小于3," : "人数不能大于5,";
|
|
|
|
+// throw new BizException(classGroup.getName() + numWaring + "请调整");
|
|
|
|
+// }
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum.toString());
|
|
}
|
|
}
|
|
|
|
|