新增训练说明

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/LessonExaminationResultDto.java

@@ -61,8 +61,5 @@ public class LessonExaminationResultDto{
 
     @ApiModelProperty("作业分组")
     private Integer group;
-
-    @ApiModelProperty("作业详情")
-    private StudentLessonExaminationDetail studentLessonExaminationDetail;
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentLessonExaminationDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -43,5 +44,8 @@ public class StudentLessonExaminationDto {
 
     @ApiModelProperty("作业分组")
     private Integer group;
+
+    @ApiModelProperty("作业详情")
+    private StudentLessonExaminationDetail studentLessonExaminationDetail;
 }
 

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

@@ -148,13 +148,6 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
             if(CollectionUtils.isNotEmpty(examinationIds)){
                 nameMap = MapUtil.convertMybatisMap(studentLessonExaminationService.getDao().getStudentName(examinationIds));
             }
-            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.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));
             Set<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
@@ -164,10 +157,6 @@ 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.getGroup());
-                if(studentLessonExaminationDetail != null){
-                    vo.setStudentLessonExaminationDetail(studentLessonExaminationDetail);
-                }
                 if(StringUtils.isNotEmpty(username)){
                     if(vo.getExpectNum() > 1){
                         StringBuffer sb = new StringBuffer(username);

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

@@ -107,6 +107,21 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = baseMapper.queryPage(params);
+            if(queryInfo.getLessonExaminationId() != null){
+                Map<Integer, StudentLessonExaminationDetail> examinationIdMap = new HashMap<>();
+                if(queryInfo.getLessonExaminationId() != null){
+                    List<StudentLessonExaminationDetail> list = studentLessonExaminationDetailService.lambdaQuery().
+                            eq(StudentLessonExaminationDetail::getLessonExaminationId, queryInfo.getLessonExaminationId()).list();
+                    examinationIdMap = list.stream().collect(Collectors.groupingBy(StudentLessonExaminationDetail::getUserId,
+                            Collectors.collectingAndThen(Collectors.toList(), e -> e.get(0))));
+                    for (StudentLessonExaminationDto dto : dataList) {
+                        StudentLessonExaminationDetail detail = examinationIdMap.get(dto.getUserId());
+                        if (detail != null) {
+                            dto.setStudentLessonExaminationDetail(detail);
+                        }
+                    }
+                }
+            }
         }
         if (count == 0) {
             dataList = new ArrayList<>();