|
@@ -124,7 +124,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
|
|
|
BigDecimal duration = new BigDecimal(DateUtil.minutesBetween(ts.getCourseSchedule().getStartClassTime(), ts.getCourseSchedule()
|
|
|
.getEndClassTime()));
|
|
|
int mins = 0;
|
|
|
- if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE || tdms.getCourseScheduleType() == CourseScheduleType.MUSIC_NETWORK) {
|
|
|
+ if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH || tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE || tdms.getCourseScheduleType() == CourseScheduleType.MUSIC_NETWORK) {
|
|
|
if (!classGroupStudentNumMap.containsKey(ts.getClassGroupId())) {
|
|
|
// 查询 班级人数
|
|
|
String[] strs = classGroupStudentMapperDao.findStudentNumByClassGroupId(ts.getClassGroupId());
|
|
@@ -140,7 +140,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
|
|
|
if(studentNum == null || studentNum == 0){
|
|
|
studentNum = 1;
|
|
|
}
|
|
|
- if(studentNum>5){
|
|
|
+ if(studentNum>5 && tdms.getCourseScheduleType() != CourseScheduleType.HIGH){
|
|
|
studentNum = 5;
|
|
|
}
|
|
|
ts.setExpectSalary(new BigDecimal(obj.getDouble(studentNum + "")));
|