Merge remote-tracking branch 'origin/master'

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

@@ -188,24 +188,21 @@
 
 	<select id="getSchoolData" resultMap="IndexBaseMonthData">
 		SELECT
-			organ_id_,
+			mg.organ_id_,
 			CONCAT(#{month}, '-01') month_,
-			COUNT( id_ ) total_num_,
-			COUNT( id_ ) activate_num_,
-			COUNT( id_ ) percent_
+			COUNT( DISTINCT mg.cooperation_organ_id_ ) total_num_,
+			COUNT( DISTINCT mg.cooperation_organ_id_ ) activate_num_,
+			COUNT( DISTINCT mg.cooperation_organ_id_ ) percent_
 		FROM
-			cooperation_organ
+			music_group mg
 		WHERE
-			del_flag_ = 0
-		  	AND is_enable_ = 1
-		  	AND organ_id_ IS NOT NULL
-		  	<if test="month!=null and month!=''">
-				AND DATE_FORMAT(create_time_, '%Y-%m') &lt;= #{month}
-			</if>
+			mg.del_flag_ = 0
+		  AND mg.organ_id_ IS NOT NULL
+		  AND mg.status_ = 'PROGRESS'
 		GROUP BY
-			organ_id_
+			mg.organ_id_
 		ORDER BY
-			organ_id_;
+			mg.organ_id_;
 	</select>
 	<select id="getMusicData" resultMap="IndexBaseMonthData">
 		SELECT