|
|
@@ -523,9 +523,9 @@
|
|
|
<if test="subjectId != null">
|
|
|
left join student st ON st.user_id_ = cssp.user_id_
|
|
|
</if>
|
|
|
- where cg.status_ = 'ING' AND cg.teacher_id_ = #{teacherId}
|
|
|
+ where cg.teacher_id_ = #{teacherId}
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
- AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
|
|
|
+ AND cs.class_date_ BETWEEN #{startTime} AND #{endTime} AND cs.lock_ = 0
|
|
|
</if>
|
|
|
<if test="subjectId != null">
|
|
|
and find_in_set(#{subjectId},st.subject_id_)
|
