Browse Source

Merge remote-tracking branch 'origin/master'

周箭河 5 years ago
parent
commit
6d6a18854b

+ 2 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -168,8 +168,9 @@
     </select>
 
     <select id="initMusicGroupStudentFee" resultMap="MusicGroupStudentFee">
-        SELECT sr.music_group_id_,sr.user_id_,sr.actual_subject_id_ subject_id_ FROM student_registration sr
+        SELECT sr.music_group_id_,sr.user_id_,sr.actual_subject_id_ subject_id_,mgsp.fee_ course_fee_ FROM student_registration sr
         LEFT JOIN music_group_student_fee_ mgsf ON sr.user_id_ = mgsf.user_id_ AND sr.music_group_id_ = mgsf.music_group_id_
+        LEFT JOIN music_group_subject_plan mgsp ON mgsp.music_group_id_ = sr.music_group_id_ AND mgsp.subject_id_ = sr.actual_subject_id_
         WHERE sr.music_group_status_ != 'QUIT' AND sr.payment_status_ = 2 AND mgsf.id_ IS NULL AND sr.music_group_id_ = #{musicGroupId}
     </select>