|
|
@@ -16,8 +16,8 @@
|
|
|
<result column="pay_time_" property="payTime" />
|
|
|
<result column="start_payment_date_" property="startPaymentDate" />
|
|
|
<result column="deadline_payment_date_" property="deadlinePaymentDate" />
|
|
|
- <result column="start_payment_date_mgpc" property="startPaymentDateMgpc" />
|
|
|
- <result column="deadline_payment_date_mgpc" property="deadlinePaymentDateMgpc" />
|
|
|
+ <result column="start_payment_date_mgpc_" property="startPaymentDateMgpc" />
|
|
|
+ <result column="deadline_payment_date_mgpc_" property="deadlinePaymentDateMgpc" />
|
|
|
<result column="update_time_" property="updateTime" />
|
|
|
<result column="create_time_" property="createTime" />
|
|
|
<result column="open_" property="open"/>
|
|
|
@@ -173,7 +173,9 @@
|
|
|
|
|
|
<!-- 分页查询 -->
|
|
|
<select id="queryPage" resultMap="MusicGroupPaymentCalenderDetail" parameterType="map">
|
|
|
- SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,mgpc.start_payment_date_ start_payment_date_mgpc,mgpc.deadline_payment_date_ deadline_payment_date_mgpc
|
|
|
+ SELECT mgpcd.*,su.username_,su.phone_,st.name_ subject_names_,sr.music_group_status_,
|
|
|
+ CASE WHEN mgpcd.start_payment_date_ IS NULL THEN mgpc.start_payment_date_ ELSE mgpcd.start_payment_date_ END start_payment_date_mgpc_,
|
|
|
+ CASE WHEN mgpcd.deadline_payment_date_ IS NULL THEN mgpc.deadline_payment_date_ ELSE mgpcd.deadline_payment_date_ END deadline_payment_date_mgpc_
|
|
|
FROM music_group_payment_calender_detail mgpcd
|
|
|
LEFT JOIN sys_user su ON su.id_ = mgpcd.user_id_
|
|
|
LEFT JOIN student_registration sr ON sr.user_id_ = mgpcd.user_id_
|
zouxuan