|
|
@@ -115,8 +115,8 @@
|
|
|
FROM student t
|
|
|
left join sys_user u on t.user_id_ = u.id_
|
|
|
left join tenant_info ti on t.tenant_id_ = ti.id_
|
|
|
- left join vip_card_record vcr on t.user_id_ = vcr.user_id_ and vcr.efficient_flag_ = 1 and (vcr.vip_type_ = 'VIP' or vcr.vip_type_ = 'SVIP') and client_type_='STUDENT'
|
|
|
- left join vip_card_record vcr2 on t.user_id_ = vcr2.user_id_ and vcr2.efficient_flag_ = 1 and vcr2.end_time_ > now() and now() >= vcr2.start_time_ and client_type_='STUDENT'
|
|
|
+ left join vip_card_record vcr on t.user_id_ = vcr.user_id_ and vcr.efficient_flag_ = 1 and (vcr.vip_type_ = 'VIP' or vcr.vip_type_ = 'SVIP') and vcr.client_type_='STUDENT'
|
|
|
+ left join vip_card_record vcr2 on t.user_id_ = vcr2.user_id_ and vcr2.efficient_flag_ = 1 and vcr2.end_time_ > now() and now() >= vcr2.start_time_ and vcr2.client_type_='STUDENT'
|
|
|
<where>
|
|
|
<if test="null != param.search and '' != param.search">
|
|
|
AND (
|
|
|
@@ -133,10 +133,10 @@
|
|
|
AND FIND_IN_SET(t.subject_id_, #{param.subjectId})
|
|
|
</if>
|
|
|
<if test="param.vipType != null">
|
|
|
- <if test="param.vipType == 'NORMAL'">
|
|
|
+ <if test="param.vipType.code == 'NORMAL'">
|
|
|
and vcr2.id_ is null
|
|
|
</if>
|
|
|
- <if test="param.vipType != 'NORMAL'">
|
|
|
+ <if test="param.vipType.code != 'NORMAL'">
|
|
|
and vcr2.vip_type_ = #{param.vipType}
|
|
|
</if>
|
|
|
</if>
|
yuanliang