|
|
@@ -397,10 +397,10 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="queryNoPaymentTotalAmount" resultType="java.util.Map">
|
|
|
- SELECT mgpcd.user_id_ 'key',SUM(mgpcd.expect_amount_ + mgpcd.expect_member_amount_) 'value' FROM music_group_payment_calender_detail mgpcd
|
|
|
+ SELECT mgpcd.user_id_ 'key',SUM(mgpc.current_total_amount_) 'value' FROM music_group_payment_calender_detail mgpcd
|
|
|
LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
|
|
|
LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_ AND sr.music_group_id_ = mgpc.music_group_id_
|
|
|
- WHERE mgpc.batch_no_ IS NOT NULL AND mgpcd.payment_status_ = 'NON_PAYMENT' AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
|
|
|
+ WHERE mgpc.batch_no_ IS NOT NULL AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.current_total_amount_ > 0
|
|
|
AND mgpc.music_group_id_ = #{musicGroupId} AND mgpc.status_ IN ('OPEN','OVER','PAID') AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
AND ((mgpc.member_rank_setting_id_ IS NOT NULL AND (sr.membership_end_time_ < NOW() OR sr.membership_end_time_ IS NULL)) OR mgpc.member_rank_setting_id_ IS NULL)
|
|
|
GROUP BY mgpcd.user_id_
|
|
|
@@ -409,7 +409,7 @@
|
|
|
<select id="queryNoPaymentUserIds" resultType="java.lang.Integer">
|
|
|
SELECT mgpcd.user_id_ FROM music_group_payment_calender_detail mgpcd
|
|
|
LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
|
|
|
- WHERE mgpc.batch_no_ IS NOT NULL AND mgpcd.payment_status_ = 'NON_PAYMENT' AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
|
|
|
+ WHERE mgpc.batch_no_ IS NOT NULL AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.current_total_amount_ > 0
|
|
|
AND mgpc.music_group_id_ = #{musicGroupId} AND mgpc.status_ IN ('OPEN','OVER','PAID') AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
<if test="userIds != null">
|
|
|
AND mgpcd.user_id_ IN
|
|
|
@@ -417,7 +417,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- GROUP BY mgpcd.user_id_ HAVING SUM(mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
|
|
|
+ GROUP BY mgpcd.user_id_ HAVING mgpc.current_total_amount_ > 0
|
|
|
</select>
|
|
|
|
|
|
<resultMap id="MusicArrearageStudentDto" type="com.ym.mec.biz.dal.dto.MusicArrearageStudentDto">
|
|
|
@@ -446,7 +446,7 @@
|
|
|
AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN DATE_FORMAT(mgpc.start_payment_date_,'%Y-%m-%d') AND DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
|
|
|
</if>
|
|
|
AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
- AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
|
|
|
+ AND mgpc.current_total_amount_ > 0
|
|
|
<if test="organIds != null and organIds != ''">
|
|
|
AND FIND_IN_SET(mg.organ_id_,#{organIds})
|
|
|
</if>
|
|
|
@@ -471,7 +471,7 @@
|
|
|
<select id="queryArrearageStudents" resultMap="MusicArrearageStudentDto">
|
|
|
SELECT
|
|
|
mgpcd.user_id_,
|
|
|
- SUM(mgpcd.expect_amount_ + mgpcd.expect_member_amount_) no_payment_amount_,
|
|
|
+ mgpc.current_total_amount_ no_payment_amount_,
|
|
|
su.username_ student_name_,
|
|
|
organ.name_ organ_name_,
|
|
|
co.name_ cooperation_name_,
|
|
|
@@ -523,7 +523,7 @@
|
|
|
WHERE mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
|
|
|
AND DATE_FORMAT( NOW(), '%Y-%m-%d' ) >= DATE_FORMAT( mgpc.payment_valid_start_date_, '%Y-%m-%d' )
|
|
|
AND mgpcd.payment_status_ = 'NON_PAYMENT'
|
|
|
- AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0 AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
+ AND mgpc.current_total_amount_ > 0 AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
|
|
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
|
|
|
@@ -535,7 +535,7 @@
|
|
|
resultMap="MusicGroupPaymentCalenderDetail">
|
|
|
SELECT mgpcd.* FROM music_group_payment_calender_detail mgpcd
|
|
|
LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
|
|
|
- WHERE (mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1) AND mgpcd.payment_status_ = 'NON_PAYMENT' AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) != 0
|
|
|
+ WHERE (mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1) AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.current_total_amount_ > 0
|
|
|
AND mgpcd.music_group_payment_calender_id_ = #{calenderId} AND FIND_IN_SET(mgpcd.user_id_,#{studentIds})
|
|
|
</select>
|
|
|
<select id="countDetailPage" resultType="java.lang.Integer">
|
zouxuan