|
|
@@ -1549,14 +1549,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//获取助教老师
|
|
|
Map<Integer, String> subTeachers = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupDao.countStudentNum(join, "TEACHING"))), HashMap.class);
|
|
|
//获取在读人数
|
|
|
- Map<String, Integer> studyNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countStudyNum(join))), HashMap.class);
|
|
|
+ Map<Integer, Integer> studyNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countStudyNum(join))), HashMap.class);
|
|
|
//获取退班人数
|
|
|
- Map<String, Integer> quitNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countQuitNum(join))), HashMap.class);
|
|
|
+ Map<Integer, Integer> quitNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countQuitNum(join))), HashMap.class);
|
|
|
dataList.forEach(e -> {
|
|
|
e.setMasterTeacher(masterTeachers.get(e.getClassGroupId()));
|
|
|
e.setSubTeacher(subTeachers.get(e.getClassGroupId()));
|
|
|
- e.setStudyNum(studyNums.get(e.getClassGroupId().toString()));
|
|
|
- e.setQuitNum(quitNums.get(e.getClassGroupId().toString()));
|
|
|
+ e.setStudyNum(studyNums.get(e.getClassGroupId()));
|
|
|
+ e.setQuitNum(quitNums.get(e.getClassGroupId()));
|
|
|
});
|
|
|
}
|
|
|
if (count == 0) {
|
zouxuan