Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -1389,7 +1389,7 @@
 	</select>
 
 	<select id="getOtherAmountDataWithTimelyDetails" resultMap="IndexBaseMonthData">
-		SELECT organ_id_,SUM(c.total_num_) total_num_,month_ FROM (
+		SELECT organ_id_,SUM(c.total_num_) total_num_,SUM(c.total_num_) activate_num_,SUM(c.total_num_) percent_,month_ FROM (
 		SELECT spo.organ_id_,SUM(CASE WHEN spo.actual_amount_ IS NULL THEN 0 ELSE spo.actual_amount_ END +
 							   CASE WHEN spo.balance_payment_amount_ IS NULL THEN 0 ELSE spo.balance_payment_amount_ END) total_num_
 		   ,DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') month_