新增训练说明

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/LessonExaminationResultDto.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;
 
@@ -60,5 +61,8 @@ public class LessonExaminationResultDto{
 
     @ApiModelProperty("作业分组")
     private Integer group;
+
+    @ApiModelProperty("作业详情")
+    private StudentLessonExaminationDetail studentLessonExaminationDetail;
 }
 

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

@@ -148,6 +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<>();
+            if(queryInfo.getLessonExaminationId() != null){
+                List<StudentLessonExaminationDetail> list = studentLessonExaminationDetailService.lambdaQuery().
+                        in(StudentLessonExaminationDetail::getLessonExaminationId, examinationIds).list();
+                examinationIdMap = list.stream().collect(Collectors.toMap(StudentLessonExaminationDetail::getLessonExaminationId, v -> v));
+            }
             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());
@@ -157,6 +163,10 @@ 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());
+                if(studentLessonExaminationDetail != null){
+                    vo.setStudentLessonExaminationDetail(studentLessonExaminationDetail);
+                }
                 if(StringUtils.isNotEmpty(username)){
                     if(vo.getExpectNum() > 1){
                         StringBuffer sb = new StringBuffer(username);