课后作业和课外作业展示乐团声部

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

@@ -1801,10 +1801,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .filter(studentAttendanceViewDto -> studentAttendanceViewDto.getGroupType().equals("MUSIC"))
                     .collect(Collectors.toList());
 
+
             if (!CollectionUtils.isEmpty(tempIds) && schedule.getGroupType() == MUSIC) {
+                List<Map<Integer, String>> studentSubjectNameMaps = subjectDao.findStudentSubjectNameMaps(tempIds);
+                Map<Integer, String> studentSubjectNameMap = MapUtil.convertIntegerMap(studentSubjectNameMaps);
+                List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
+                Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     if (Objects.nonNull(studentAttendanceViewDto.getBeMerged()) && studentAttendanceViewDto.getBeMerged()) {
                         studentAttendanceViewDto.setSubjectName("被合并学员");
+                    } else {
+                        studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                        studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
                     }
                 });
             } else if (schedule.getGroupType() != MUSIC) {

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -205,15 +205,12 @@
             cssp.be_merged_,
             st.current_grade_num_,
             st.current_class_,
-        s.id_ as subject_id_,
-        s.name_ as subject_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student st ON st.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-        left join subject s on st.subject_id_list_ = s.id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -4044,7 +4044,8 @@
         SELECT su.avatar_,su.username_,sa.user_id_,sb.name_ subject_name_,sa.qualified_flag_,s.repair_flag_
         FROM student_attendance sa
         LEFT JOIN student s ON s.user_id_ = sa.user_id_
-        LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
+        left join student_registration sr on sr.user_id_ = sa.user_id_ and sr.music_group_id_ = sa.music_group_id_
+        LEFT JOIN `subject` sb ON sb.id_ = sr.subject_id_
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE sa.id_ IS NOT NULL AND sa.course_schedule_id_ = #{courseScheduleId} AND sa.status_ IN ('NORMAL','LATE')
         <include refid="global.limit"/>

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -226,8 +226,9 @@
 				LEFT JOIN class_group_student_mapper cgsm ON sees.student_id_ = cgsm.user_id_
 			</if>
 			LEFT JOIN student stu ON stu.user_id_ = sees.student_id_
+            left join student_registration sr on sees.student_id_ = sr.user_id_ and sr.music_group_id_ = sees.music_group_id_
 			LEFT JOIN sys_user su ON su.id_ = sees.student_id_
-			LEFT JOIN `subject` sub ON FIND_IN_SET( sub.id_, stu.subject_id_list_ )
+			LEFT JOIN `subject` sub ON sub.id_ = sr.subject_id_
 		WHERE
 			sees.monday_ = #{startDate}
 			AND sees.teacher_id_ = #{teacherId}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.CourseHomeworkWrapper;
 import com.ym.mec.biz.dal.dto.StudentExercisesSituationDto;
@@ -57,6 +58,9 @@ public class ExtracurricularExercisesController extends BaseController {
     @Autowired
     private StudentDao studentDao;
 
+    @Autowired
+    private SubjectDao subjectDao;
+
     @ApiOperation(value = "获取教师有服务指标的课程列表")
     @GetMapping("/queryTeacherServeHomeworkDetail")
     public HttpResponseResult queryTeacherServeHomeworkDetail(TeacherServeHomeworkQueryInfo queryInfo) {
@@ -222,7 +226,10 @@ public class ExtracurricularExercisesController extends BaseController {
         List<ClassGroup> classGroups = classGroupStudentMapperDao.getStudentClassGroupWithTeacher(studentIds, sysUser.getId(), musicGroupId);
         result.put("classGroups", classGroups);
 
-        List<Subject> studentSubjects = studentDao.getStudentSubjects(studentIds);
+//        List<Subject> studentSubjects = studentDao.getStudentSubjects(studentIds);
+//        result.put("subjects", studentSubjects);
+        List<Integer> subjectIds = dontServeStudents.stream().map(BasicUserDto::getSubjectId).collect(Collectors.toList());
+        List<Subject> studentSubjects = subjectDao.findBySubjectIds(subjectIds);
         result.put("subjects", studentSubjects);
         return succeed(result);
     }