|
|
@@ -486,7 +486,7 @@
|
|
|
LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
|
|
|
WHERE
|
|
|
mg.status_ = 'PROGRESS'
|
|
|
- AND mgpc.payment_valid_end_date_ < NOW()
|
|
|
+ AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
|
|
|
AND mgpcd.payment_status_ = 'NON_PAYMENT'
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
|
|
@@ -505,7 +505,7 @@
|
|
|
LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
|
|
|
WHERE
|
|
|
mg.status_ = 'PROGRESS'
|
|
|
- AND mgpc.payment_valid_end_date_ < NOW()
|
|
|
+ AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
|
|
|
AND mgpcd.payment_status_ = 'NON_PAYMENT'
|
|
|
<if test="organIds!=null and organIds.size()>0">
|
|
|
AND mg.organ_id_ IN
|
