Merge branch 'zx_saas_0810' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -269,11 +269,14 @@
 		group by organ_id_
 	</select>
 	<select id="sumSchoolAmount" resultType="java.util.Map">
-		select mgpc.organ_id_ 'key',SUM(mgpc.current_total_amount_ * mgpc.actual_num_) - SUM(spro.service_amount_) - SUM(spro.sale_amount_) 'value'
-		from student_payment_route_order spro
-		LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = spro.calender_id_
-		where spro.calender_id_ IS NOT NULL AND spro.audit_status_ = 'PASS' AND mgpc.id_ = spro.calender_id_
-		group by mgpc.organ_id_
+		select mg.organ_id_ 'key',SUM(mg.amount_) 'value' from (
+		select mgpc.organ_id_,mgpc.current_total_amount_ - SUM(spro.service_amount_) - SUM(spro.sale_amount_) amount_ from (
+		select mgpc.* from music_group_payment_calender mgpc
+		left join music_group_payment_calender_detail mgpcd ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
+		where mgpcd.id_ IS NOT NULL AND mgpc.pay_user_type_ = 'SCHOOL'
+		group by mgpc.id_) mgpc
+		left join student_payment_route_order spro ON spro.calender_id_ = mgpc.id_ AND spro.audit_status_ = 'PASS'
+		group by mgpc.id_) mg group by mg.organ_id_
 	</select>
 	<select id="sumMusicMargin" resultType="java.util.Map">
 		select mm.organ_id_ 'key',SUM(mm.balance_) 'value' from music_margin mm where mm.refund_flag_ = 0 group by mm.organ_id_;