|
@@ -514,7 +514,18 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
|
|
|
@Override
|
|
|
public List<StudentRegistration> findMusicGroupNoClassGroupStudent(String musicGroupId, Integer actualSubjectId) {
|
|
|
- return studentRegistrationDao.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId);
|
|
|
+ //获取所有声部
|
|
|
+ List<Subject> subjectList = subjectService.findAll(new HashMap<>());
|
|
|
+ List<StudentRegistration> classGroupStuList = studentRegistrationDao.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId);
|
|
|
+ for (StudentRegistration studentRegistration : classGroupStuList) {
|
|
|
+ for (Subject subject : subjectList) {
|
|
|
+ if (studentRegistration.getActualSubjectId().equals(subject.getId())) {
|
|
|
+ studentRegistration.setSubjectName(subject.getName());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return classGroupStuList;
|
|
|
}
|
|
|
|
|
|
@Override
|