|
@@ -189,6 +189,9 @@
|
|
<if test="repairStatus != null">
|
|
<if test="repairStatus != null">
|
|
AND sr.repair_status_ = #{repairStatus}
|
|
AND sr.repair_status_ = #{repairStatus}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="payStatus != null">
|
|
|
|
+ AND sr.pay_status_ = #{payStatus}
|
|
|
|
+ </if>
|
|
<if test="startTime != null">
|
|
<if test="startTime != null">
|
|
AND sr.create_time_ >= #{startTime}
|
|
AND sr.create_time_ >= #{startTime}
|
|
</if>
|
|
</if>
|
|
@@ -240,11 +243,11 @@
|
|
SELECT su.real_name_ username_, su.id_ user_id_, su.avatar_ head_url_
|
|
SELECT su.real_name_ username_, su.id_ user_id_, su.avatar_ head_url_
|
|
FROM music_group mg
|
|
FROM music_group mg
|
|
LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
|
|
LEFT JOIN student_registration sr on sr.music_group_id_ = mg.id_
|
|
- LEFT JOIN sys_user su ON su.id_ = sr.id_
|
|
|
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = sr.user_id_
|
|
WHERE sr.user_id_ = #{studentId}
|
|
WHERE sr.user_id_ = #{studentId}
|
|
AND mg.status_ = 'PROGRESS'
|
|
AND mg.status_ = 'PROGRESS'
|
|
AND mg.repair_user_id_ IS NOT NULL
|
|
AND mg.repair_user_id_ IS NOT NULL
|
|
- ORDER BY id_ DESC
|
|
|
|
|
|
+ ORDER BY mg.id_ DESC
|
|
LIMIT 1
|
|
LIMIT 1
|
|
</select>
|
|
</select>
|
|
|
|
|