Merge remote-tracking branch 'origin/master'

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

@@ -666,17 +666,17 @@
 		AND del_flag_ = 0 GROUP BY fe.organ_id_
 	</select>
 	<select id="getFinanceBalanceData" resultMap="IndexBaseMonthData">
-		SELECT spo.organ_id_,SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) total_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) activate_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) percent_,#{dayStr} month_
+		SELECT spo.organ_id_,SUM(spo.balance_payment_amount_) total_num_,
+			   SUM(spo.balance_payment_amount_) activate_num_,
+			   SUM(spo.balance_payment_amount_) percent_,#{dayStr} month_
 		FROM student_payment_order spo
 		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
 		GROUP BY spo.organ_id_
 	</select>
 	<select id="getFinanceActualData" resultMap="IndexBaseMonthData">
-		SELECT spo.organ_id_,SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) total_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) activate_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) percent_,#{dayStr} month_
+		SELECT spo.organ_id_,SUM(spo.actual_amount_) total_num_,
+			   SUM(spo.actual_amount_) activate_num_,
+			   SUM(spo.actual_amount_) percent_,#{dayStr} month_
 		FROM student_payment_order spo
 		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
 		GROUP BY spo.organ_id_