|
@@ -1963,10 +1963,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
return null;
|
|
|
}
|
|
|
String classGroupIds = classGroups.stream().map(classGroup -> classGroup.getId().toString()).collect(Collectors.joining(","));
|
|
|
+ Set<Integer> classGroupSet = classGroups.stream().map(classGroup -> classGroup.getId()).collect(Collectors.toSet());
|
|
|
|
|
|
List<ClassGroupTeacherMapper> classGroupTeachers = classGroupTeacherMapperDao.findClassGroupTeachers(classGroupIds);
|
|
|
Map<Integer, Integer> studyNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countStudyNum(classGroupIds))), HashMap.class);
|
|
|
|
|
|
+ Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countTotalNumByClassGroupId(classGroupSet, null));
|
|
|
+ Map<Integer, Long> currentNumMap = MapUtil.convertIntegerMap(courseScheduleDao.countCurrentNumByClassGroupId(classGroupSet, null));
|
|
|
+
|
|
|
for (ClassGroupTeachersDto classGroup : classGroups) {
|
|
|
List<ClassGroupTeacherMapper> classGroupTeacherMappers = new ArrayList<>();
|
|
|
for (ClassGroupTeacherMapper classGroupTeacher : classGroupTeachers) {
|
|
@@ -1975,6 +1979,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
classGroup.setClassGroupTeacherMapperList(classGroupTeacherMappers);
|
|
|
classGroup.setStudentNum(studyNums.get(classGroup.getId()));
|
|
|
+ classGroup.setTotalClassTimes(totalNumMap.get(classGroup.getId()).intValue());
|
|
|
+ classGroup.setCurrentClassTimes(currentNumMap.get(classGroup.getId()).intValue());
|
|
|
}
|
|
|
return classGroups;
|
|
|
}
|