|
|
@@ -129,8 +129,7 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
Page<BaseStudentUserPageVo> studentPage = studentManagerService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), studentDto);
|
|
|
|
|
|
Set<Long> userIdSet = studentPage.getRecords().stream().map(x -> Long.parseLong(x.getId())).collect(Collectors.toSet());
|
|
|
- ArrayList<Long> userIdList = new ArrayList<>(userIdSet);
|
|
|
-
|
|
|
+ dto.setUserIdList(new ArrayList<>(userIdSet));
|
|
|
List<ExamSubjectScore> allScoreList = this.baseMapper.getClassStudentScoreList(dto);
|
|
|
Map<Long, List<ExamSubjectScore>> listMap = allScoreList.stream().collect(Collectors.groupingBy(ExamSubjectScore::getUserId));
|
|
|
PageOutput<ClassStudentScorePageVo> pageOutput = ConventPage.getPageOutput(studentPage, ClassStudentScorePageVo.class);
|
|
|
@@ -140,6 +139,9 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
|
|
|
List<ClassStudentScoreTitleVo> scoreList = new ArrayList<>();
|
|
|
|
|
|
List<ExamSubjectScore> scores = listMap.get(userId);
|
|
|
+ if(scores == null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
for (ExamSubjectScore score : scores) {
|
|
|
scoreList.add(
|
|
|
new ClassStudentScoreTitleVo(){{
|