|
@@ -161,7 +161,7 @@
|
|
|
ORDER BY create_time_ DESC LIMIT 1
|
|
ORDER BY create_time_ DESC LIMIT 1
|
|
|
</select>
|
|
</select>
|
|
|
<select id="findNoExercisesStudentsInThisWeekWithTeacher"
|
|
<select id="findNoExercisesStudentsInThisWeekWithTeacher"
|
|
|
- resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
|
|
|
|
|
|
|
+ resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
|
|
|
SELECT
|
|
SELECT
|
|
|
su.id_ userId,
|
|
su.id_ userId,
|
|
|
su.username_ name,
|
|
su.username_ name,
|
|
@@ -169,16 +169,15 @@
|
|
|
GROUP_CONCAT(sub.name_) subjectName
|
|
GROUP_CONCAT(sub.name_) subjectName
|
|
|
FROM
|
|
FROM
|
|
|
student_extracurricular_exercises_situation_ sees
|
|
student_extracurricular_exercises_situation_ sees
|
|
|
- LEFT JOIN extracurricular_exercises_reply eer ON sees.student_id_ = eer.user_id_
|
|
|
|
|
- AND DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) >= #{startDate}
|
|
|
|
|
LEFT JOIN student stu ON stu.user_id_ = sees.student_id_
|
|
LEFT JOIN student stu ON stu.user_id_ = sees.student_id_
|
|
|
LEFT JOIN sys_user su ON su.id_ = sees.student_id_
|
|
LEFT JOIN sys_user su ON su.id_ = sees.student_id_
|
|
|
LEFT JOIN `subject` sub ON FIND_IN_SET( sub.id_, stu.subject_id_list_ )
|
|
LEFT JOIN `subject` sub ON FIND_IN_SET( sub.id_, stu.subject_id_list_ )
|
|
|
WHERE
|
|
WHERE
|
|
|
sees.monday_ = #{startDate}
|
|
sees.monday_ = #{startDate}
|
|
|
AND sees.teacher_id_ = #{teacherId}
|
|
AND sees.teacher_id_ = #{teacherId}
|
|
|
- AND eer.id_ IS NULL
|
|
|
|
|
- <if test="search!=null">
|
|
|
|
|
|
|
+ AND sees.actual_exercises_num_ = 0
|
|
|
|
|
+ AND sees.serve_type_ = 'EXERCISE'
|
|
|
|
|
+ <if test="search!=null">
|
|
|
AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT(#{search}, '%'))
|
|
AND (su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT(#{search}, '%'))
|
|
|
</if>
|
|
</if>
|
|
|
GROUP BY su.id_
|
|
GROUP BY su.id_
|
Joburgess