|
|
@@ -2560,7 +2560,8 @@
|
|
|
|
|
|
<select id="endCountCourseSchedules" resultType="int">
|
|
|
SELECT COUNT(c.id_) FROM (
|
|
|
- SELECT cs.id_,GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds FROM course_schedule cs
|
|
|
+ SELECT cs.id_,GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds
|
|
|
+ FROM course_schedule cs
|
|
|
<if test="studentId != null or searchType == 'TEACHER_ERR_ATTENDANCE' or searchType == 'STUDENT_ERR_ATTENDANCE'">
|
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
|
</if>
|
|
|
@@ -2633,7 +2634,7 @@
|
|
|
<if test="isCallNames != null and isCallNames == 0">
|
|
|
AND sa.id_ IS NULL
|
|
|
</if>
|
|
|
- <if test="startTime != null AND startTime != ''">
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
|
|
|
</if>
|
|
|
<if test="startClassTimeStr!=null">
|
