feat:首页统计

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

@@ -351,12 +351,14 @@
 			COUNT( DISTINCT m.user_id_ ) percent_
 		FROM
 			course_schedule_student_payment m
-				LEFT JOIN course_schedule cs ON m.course_schedule_id_=cs.id_
+			LEFT JOIN course_schedule cs ON m.course_schedule_id_=cs.id_
+			LEFT JOIN practice_group pg ON m.music_group_id_=pg.id_ AND m.group_type_='PRACTICE'
 		WHERE
 			(cs.del_flag_ IS NULL OR cs.del_flag_=0)
 			AND cs.organ_id_ IS NOT NULL
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 			AND m.group_type_ IN ('VIP', 'PRACTICE')
+			AND (pg.id_ IS NULL OR pg.type_='CHARGE')
 			AND m.user_id_ IN
 			<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
 				#{studentId}
@@ -402,8 +404,8 @@
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
-			AND sr.music_group_status_ = 'NORMAL'
 		  	<if test="paymentStatus!=null">
+				AND sr.music_group_status_ IN ('NORMAL', 'QUIT')
 				AND sr.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			AND DATE_FORMAT( sr.create_time_, '%Y-%m' ) &lt;= #{month}