增加销售收入

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

@@ -262,14 +262,16 @@
     </select>
 
     <select id="getChangeGoods" resultMap="SubjectChange">
-        SELECT GROUP_CONCAT(original_musical_)     musicGroupName,
-               GROUP_CONCAT(original_accessories_) original_accessories_,
-               GROUP_CONCAT(change_musical_)       trans_no_,
-               GROUP_CONCAT(change_accessories_)   change_accessories_
-        FROM subject_change
-        WHERE music_group_id_ = #{musicGroupId}
-          AND status_ = 2
-        GROUP BY music_group_id_
+        SELECT GROUP_CONCAT(sc.original_musical_)     musicGroupName,
+               GROUP_CONCAT(sc.original_accessories_) original_accessories_,
+               GROUP_CONCAT(sc.change_musical_)       trans_no_,
+               GROUP_CONCAT(sc.change_accessories_)   change_accessories_
+        FROM subject_change sc
+                 LEFT JOIN student_registration sr ON sc.student_id_ = sr.user_id_
+        WHERE sc.music_group_id_ = #{musicGroupId}
+          AND sc.status_ = 2
+          AND sr.music_group_status_ != 'QUIT'
+        GROUP BY sc.music_group_id_
     </select>
     <resultMap id="SubjectChangeDto" type="com.ym.mec.biz.dal.entity.SubjectChange" extends="SubjectChange">
         <collection property="changeMusicalGoods" ofType="com.ym.mec.biz.dal.entity.Goods">