|
@@ -845,6 +845,8 @@
|
|
|
<result property="groupName" column="music_group_name_"/>
|
|
|
<result property="studentId" column="student_id_"/>
|
|
|
<result property="studentName" column="student_name_"/>
|
|
|
+ <result property="subjectId" column="subject_id_" />
|
|
|
+ <result property="subjectName" column="subject_name_" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="queryNoClassMusicStudentsCondition">
|
|
@@ -877,15 +879,18 @@
|
|
|
sr.music_group_id_,
|
|
|
mg.name_ music_group_name_,
|
|
|
sr.user_id_ student_id_,
|
|
|
- stu.username_ student_name_
|
|
|
+ stu.username_ student_name_,
|
|
|
+ sr.actual_subject_id_ subject_id_,
|
|
|
+ sub.name_ subject_name_
|
|
|
FROM
|
|
|
student_registration sr
|
|
|
- LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
- LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
|
|
|
- AND cgsm.music_group_id_ = sr.music_group_id_
|
|
|
- AND cgsm.user_id_ = sr.user_id_
|
|
|
- LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
|
|
|
- LEFT JOIN organization organ ON mg.organ_id_=organ.id_
|
|
|
+ LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
|
|
|
+ LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
|
|
|
+ AND cgsm.music_group_id_ = sr.music_group_id_
|
|
|
+ AND cgsm.user_id_ = sr.user_id_
|
|
|
+ LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
|
|
|
+ LEFT JOIN organization organ ON mg.organ_id_=organ.id_
|
|
|
+ LEFT JOIN `subject` sub ON sub.id_=sr.actual_subject_id_
|
|
|
<include refid="queryNoClassMusicStudentsCondition" />
|
|
|
ORDER BY mg.organ_id_,sr.user_id_
|
|
|
<include refid="global.limit"></include>
|