|
@@ -519,7 +519,6 @@
|
|
|
DISTINCT su.id_ userId,su.username_ userName, su.avatar_ avatar, su.phone_ phone
|
|
|
FROM
|
|
|
sys_user su
|
|
|
- LEFT JOIN practice_group pg ON pg.student_id_ = su.id_
|
|
|
WHERE
|
|
|
1=1
|
|
|
<if test="organIdList!=null">
|
|
@@ -531,11 +530,11 @@
|
|
|
<if test="search != null">
|
|
|
AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
|
|
|
</if>
|
|
|
- AND pg.student_id_ NOT IN (
|
|
|
+ AND su.id_ NOT IN (
|
|
|
SELECT student_id_ FROM practice_group WHERE type_='CHARGE'
|
|
|
)
|
|
|
AND NOT EXISTS (
|
|
|
- SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
|
|
|
+ SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
|
|
|
)
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
@@ -544,7 +543,6 @@
|
|
|
COUNT(DISTINCT su.id_)
|
|
|
FROM
|
|
|
sys_user su
|
|
|
- LEFT JOIN practice_group pg ON pg.student_id_ = su.id_
|
|
|
WHERE
|
|
|
1=1
|
|
|
<if test="organIdList!=null">
|
|
@@ -556,11 +554,11 @@
|
|
|
<if test="search != null">
|
|
|
AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
|
|
|
</if>
|
|
|
- AND pg.student_id_ NOT IN (
|
|
|
+ AND su.id_ NOT IN (
|
|
|
SELECT student_id_ FROM practice_group WHERE type_='CHARGE'
|
|
|
)
|
|
|
AND NOT EXISTS (
|
|
|
- SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=pg.student_id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
|
|
|
+ SELECT user_id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE' AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
|
|
|
)
|
|
|
</select>
|
|
|
<select id="findEnableAssignTeachers" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
|