zouxuan 2 years ago
parent
commit
af45bb60bd

+ 10 - 8
mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1261,14 +1261,16 @@
     </select>
 
     <select id="getStudentCooperationNameMap" resultType="java.util.Map">
-        SELECT stu.user_id_ 'key',co.name_ 'value'
-        FROM student stu
-        LEFT JOIN cooperation_organ co ON stu.cooperation_organ_id_=co.id_
-        WHERE 1=1
-            AND stu.user_id_ IN
-            <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
-                #{studentId}
-            </foreach>
+        SELECT sr.user_id_ 'key', co.name_ 'value'
+        FROM student_registration sr
+        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
+        WHERE sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
+        AND sr.user_id_ IN
+        <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
+            #{studentId}
+        </foreach>
+        GROUP BY sr.user_id_
     </select>
 
     <update id="updateGrade"><![CDATA[

+ 1 - 3
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -1304,9 +1304,7 @@
         mg.cooperation_organ_id_ cooperationOrganId
         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 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 class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN class_group_teacher_mapper cgtm
         ON cgsm.class_group_id_ = cgtm.class_group_id_ AND cgtm.teacher_role_ = 'BISHOP'