新增训练说明

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonExaminationServiceImpl.java

@@ -148,11 +148,12 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
             if(CollectionUtils.isNotEmpty(examinationIds)){
                 nameMap = MapUtil.convertMybatisMap(studentLessonExaminationService.getDao().getStudentName(examinationIds));
             }
-            Map<Long, StudentLessonExaminationDetail> examinationIdMap = new HashMap<>();
+            Map<Integer, StudentLessonExaminationDetail> examinationIdMap = new HashMap<>();
             if(queryInfo.getLessonExaminationId() != null){
                 List<StudentLessonExaminationDetail> list = studentLessonExaminationDetailService.lambdaQuery().
                         in(StudentLessonExaminationDetail::getLessonExaminationId, examinationIds).list();
-                examinationIdMap = list.stream().collect(Collectors.toMap(StudentLessonExaminationDetail::getLessonExaminationId, v -> v));
+                examinationIdMap = list.stream().collect(Collectors.groupingBy(StudentLessonExaminationDetail::getGroup,
+                        Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
             }
             List<Integer> teacherIds = dataList.stream().map(e -> e.getTeacherId()).distinct().collect(Collectors.toList());
             Map<Integer, String> teacherNameMap = MapUtil.convertIntegerMap(teacherDao.queryNameByIdList(teacherIds));
@@ -163,7 +164,7 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
                 vo.setMusicGroupName(musicGroupNameMap.get(vo.getMusicGroupId()));
                 vo.setTeacherName(teacherNameMap.get(vo.getTeacherId()));
                 String username = nameMap.get(vo.getId());
-                StudentLessonExaminationDetail studentLessonExaminationDetail = examinationIdMap.get(vo.getId());
+                StudentLessonExaminationDetail studentLessonExaminationDetail = examinationIdMap.get(vo.getGroup());
                 if(studentLessonExaminationDetail != null){
                     vo.setStudentLessonExaminationDetail(studentLessonExaminationDetail);
                 }