|
@@ -889,7 +889,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
break;
|
|
|
case "PRACTICE":
|
|
|
teacherMusicClassGroup = classGroupDao.findTeacherPracticeClassGroup(user.getId().longValue());
|
|
|
- //获取陪练课学生名称
|
|
|
break;
|
|
|
default:
|
|
|
throw new BizException("课程类型错误");
|
|
@@ -919,8 +918,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//统计班级人数
|
|
|
List<Map<Integer, Integer>> classGroupStudentNumMaps = classGroupStudentMapperDao.countClassGroupsStudentNum(classGroupIds,null);
|
|
|
Map<Integer, Long> classGroupStudentNumMap = MapUtil.convertIntegerMap(classGroupStudentNumMaps);
|
|
|
- Map<Integer, Long> currentClassTimes = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupIds,user.getId()));
|
|
|
+ Map<Integer, Long> currentClassTimes;
|
|
|
Map<Integer, Long> noStartClassTimes = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupIds,null));
|
|
|
+ if(!type.equals(GroupType.MUSIC)){
|
|
|
+ currentClassTimes = noStartClassTimes;
|
|
|
+ }else {
|
|
|
+ currentClassTimes = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupIds,user.getId()));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
teacherMusicClassGroup.forEach(teacherClassGroupDto -> {
|
|
|
if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
|