|
|
@@ -167,9 +167,6 @@
|
|
|
SELECT si.*,su.username_ studentName,su.phone_ phone,o.name_ organName FROM student_instrument si
|
|
|
LEFT JOIN sys_user su ON su.id_ = si.student_id_
|
|
|
LEFT JOIN organization o ON o.id_ = si.organ_id_
|
|
|
- <if test="musicGroupId != null and musicGroupId != ''">
|
|
|
- LEFT JOIN student_payment_order spo ON spo.id_ = si.order_id_ AND spo.music_group_id_ = #{musicGroupId} AND spo.status_ = 'SUCCESS'
|
|
|
- </if>
|
|
|
<include refid="queryPageSql"/>
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
@@ -179,17 +176,11 @@
|
|
|
SELECT COUNT(si.id_)
|
|
|
FROM student_instrument si
|
|
|
LEFT JOIN sys_user su ON su.id_ = si.student_id_
|
|
|
- <if test="musicGroupId != null and musicGroupId != ''">
|
|
|
- LEFT JOIN student_payment_order spo ON spo.id_ = si.order_id_ AND spo.music_group_id_ = #{musicGroupId} AND spo.status_ = 'SUCCESS'
|
|
|
- </if>
|
|
|
<include refid="queryPageSql"/>
|
|
|
</select>
|
|
|
|
|
|
<sql id="queryPageSql">
|
|
|
<where>
|
|
|
- <if test="musicGroupId != null and musicGroupId != ''">
|
|
|
- AND (si.order_id_ IS NULL OR spo.id_ IS NOT NULL)
|
|
|
- </if>
|
|
|
<if test="studentId != null">
|
|
|
AND si.student_id_ = #{studentId}
|
|
|
</if>
|
zouxuan