|
@@ -413,7 +413,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
EduOrganStudentDataDto organStudentVipData = new EduOrganStudentDataDto();
|
|
|
organStudentVipData.setTotalStudentNum(studentDao.getOrganStudentNum(queryInfo.getOrganId()));
|
|
|
organStudentVipData.setVipStudentNum(cloudTeacherDao.getOrganVipStudentNum(queryInfo.getOrganId()));
|
|
|
- organStudentVipData.seteVipStudentNum(studentDao.getOrganEVipStudentNum(queryInfo.getOrganId()));
|
|
|
+// organStudentVipData.seteVipStudentNum(studentDao.getOrganEVipStudentNum(queryInfo.getOrganId()));
|
|
|
organStudentVipData.setCloudStudyUseStudentNum(studentDao.getCloudStudyStudentNum(queryInfo.getOrganId()));
|
|
|
organStudentVipData.setCloudStudyLivelyStudentNum(studentDao.getCloudStudyLivelyStudentNum(queryInfo.getOrganId()));
|
|
|
organStudentVipData.setNewCloudStudyStudentNum(sysMusicCompareRecordDao.getOrganNewCloudStudyNum(queryInfo.getOrganId()));
|
|
@@ -445,11 +445,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
if(!CollectionUtils.isEmpty(organsVipStudentNumMapList)){
|
|
|
organsVipStudentNumMap = MapUtil.convertIntegerMap(organsVipStudentNumMapList);
|
|
|
}
|
|
|
- List<Map<Integer, Integer>> organsEVipStudentNumMapList = studentDao.getOrgansEVipStudentNum(organIds);
|
|
|
- Map<String, Long> organsEVipStudentNumMap = new HashMap<>();
|
|
|
- if(!CollectionUtils.isEmpty(organsEVipStudentNumMapList)){
|
|
|
- organsEVipStudentNumMap = MapUtil.convertIntegerMap(organsEVipStudentNumMapList);
|
|
|
- }
|
|
|
+// List<Map<Integer, Integer>> organsEVipStudentNumMapList = studentDao.getOrgansEVipStudentNum(organIds);
|
|
|
+// Map<String, Long> organsEVipStudentNumMap = new HashMap<>();
|
|
|
+// if(!CollectionUtils.isEmpty(organsEVipStudentNumMapList)){
|
|
|
+// organsEVipStudentNumMap = MapUtil.convertIntegerMap(organsEVipStudentNumMapList);
|
|
|
+// }
|
|
|
List<Map<Integer, Integer>> organCloudStudyStudentNumMapList = studentDao.getOrganCloudStudyStudentNum(organIds);
|
|
|
Map<String, Long> organCloudStudyStudentNumMap = new HashMap<>();
|
|
|
if(!CollectionUtils.isEmpty(organCloudStudyStudentNumMapList)){
|
|
@@ -478,9 +478,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
if(organsVipStudentNumMap.containsKey(organ.getId().toString())){
|
|
|
organStudentVipData.setVipStudentNum(organsVipStudentNumMap.get(organ.getId().toString()).intValue());
|
|
|
}
|
|
|
- if(organsEVipStudentNumMap.containsKey(organ.getId().toString())){
|
|
|
- organStudentVipData.seteVipStudentNum(organsEVipStudentNumMap.get(organ.getId().toString()).intValue());
|
|
|
- }
|
|
|
+// if(organsEVipStudentNumMap.containsKey(organ.getId().toString())){
|
|
|
+// organStudentVipData.seteVipStudentNum(organsEVipStudentNumMap.get(organ.getId().toString()).intValue());
|
|
|
+// }
|
|
|
if(organCloudStudyStudentNumMap.containsKey(organ.getId().toString())){
|
|
|
organStudentVipData.setCloudStudyUseStudentNum(organCloudStudyStudentNumMap.get(organ.getId().toString()).intValue());
|
|
|
}
|