feat:首页统计

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

@@ -427,8 +427,11 @@
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
+			<if test="paymentStatus==null">
+				AND sr.music_group_status_ IN ('APPLY', 'NORMAL')
+			</if>
 			<if test="paymentStatus!=null">
-				AND sr.music_group_status_ = 'NORMAL'
+				AND sr.music_group_status_ IN ('NORMAL')
 				AND sr.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			AND DATE_FORMAT( sr.create_time_, '%Y-%m' ) &lt;= #{month}