|
|
@@ -245,8 +245,10 @@
|
|
|
</select>
|
|
|
<select id="findExtraExercilsesHomeworks" resultMap="ExtracurricularExercisesHomeworkListDto">
|
|
|
SELECT * FROM (
|
|
|
- SELECT id_, create_time_,'EXERCISES' type_
|
|
|
- FROM extracurricular_exercises
|
|
|
+ SELECT ee.id_, ee.create_time_,'EXERCISES' type_
|
|
|
+ FROM extracurricular_exercises ee
|
|
|
+ LEFT JOIN (SELECT DISTINCT extracurricular_exercises_id_ FROM extracurricular_exercises_reply WHERE is_replied_ = 0) eer
|
|
|
+ ON eer.extracurricular_exercises_id_ = ee.id_
|
|
|
<where>
|
|
|
tenant_id_ = #{tenantId}
|
|
|
<if test="teacherId!=null">
|
|
|
@@ -256,9 +258,11 @@
|
|
|
AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
|
|
|
</if>
|
|
|
</where>
|
|
|
+ ORDER BY eer.extracurricular_exercises_id_ DESC
|
|
|
UNION ALL
|
|
|
SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
|
|
|
LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
|
|
|
+ LEFT JOIN (SELECT DISTINCT course_homework_id_ FROM student_course_homework WHERE is_replied_ = 0) sch ON sch.course_homework_id_ = ch.id_
|
|
|
<where>
|
|
|
csts.tenant_id_ = #{tenantId}
|
|
|
<if test="teacherId!=null">
|
|
|
@@ -270,7 +274,8 @@
|
|
|
<if test="createTime!=null">
|
|
|
AND DATE_FORMAT(ch.create_time_,'%Y-%m')=DATE_FORMAT(#{createTime}, '%Y-%m')
|
|
|
</if>
|
|
|
- </where>) h
|
|
|
+ </where>
|
|
|
+ ORDER BY sch.course_homework_id_ DESC ) h
|
|
|
ORDER BY h.create_time_ DESC
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
zouxuan