|
|
@@ -463,8 +463,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
if (Objects.isNull(classGroup)) {
|
|
|
throw new BizException("班级信息错误");
|
|
|
}
|
|
|
+ MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
|
|
|
//是否有预排课
|
|
|
- if(courseScheduleDao.queryPreCourseListByClassGroupId(classGroupId.intValue()).size() > 0){
|
|
|
+ if(courseScheduleDao.queryPreCourseListByMusicGroupId(musicGroup.getId()).size() > 0){
|
|
|
throw new BizException("调整失败：请先完成预排课操作");
|
|
|
}
|
|
|
if (ClassGroupTypeEnum.MUSIC_NETWORK.equals(classGroup.getType())) {
|
|
|
@@ -489,7 +490,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
oldStudentIds = classGroupStudents.stream().map(ClassGroupStudentMapper::getUserId).collect(Collectors.toSet());
|
|
|
oldNormalStudentIds = classGroupStudents.stream().filter(s -> ClassGroupStudentStatusEnum.NORMAL.equals(s.getStatus())).map(ClassGroupStudentMapper::getUserId).collect(Collectors.toSet());
|
|
|
}
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
|
|
|
+
|
|
|
//线上基础技能班，原始分班人数不能小于3人大于6人
|
|
|
if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)) {
|
|
|
|
zouxuan