|
|
@@ -130,8 +130,7 @@
|
|
|
left join organization o ON o.id_ = mg.organ_id_
|
|
|
left join music_group_payment_calender mgpc ON mgpc.id_ = mgpscd.music_group_payment_calender_id_
|
|
|
left join student_payment_order spo ON spo.calender_id_ = mgpscd.music_group_payment_calender_id_ AND mgpscd.user_id_ = spo.user_id_ AND spo.status_ = 'SUCCESS'
|
|
|
- where mgpscd.sub_course_minutes_ + mgpscd.used_course_minutes_ = mgpscd.total_course_minutes_
|
|
|
- and mgpscd.sub_course_minutes_ > 0 AND mgpc.create_time_ >= CONCAT(#{month},'-01 00:00:00')
|
|
|
+ where mgpscd.sub_course_minutes_ + mgpscd.used_course_minutes_ = mgpscd.total_course_minutes_ AND mgpc.create_time_ >= CONCAT(#{month},'-01 00:00:00')
|
|
|
<if test="organIds != null and organIds != ''">
|
|
|
AND FIND_IN_SET(mg.organ_id_,#{organIds})
|
|
|
</if>
|
