From 3012d0620b8a42ea055d773cf56925c35d00c71d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 18 六月 2024 09:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml
index cdc7dd3..9c67ad9 100644
--- a/src/main/resources/mapper/ExamMapper.xml
+++ b/src/main/resources/mapper/ExamMapper.xml
@@ -61,7 +61,7 @@
TEP.name
FROM
t_exam TE
- INNER JOIN t_user TU ON TU.id = TE.teacher_id AND TU.deleted = 0
+ INNER JOIN t_user TU ON TU.id = TE.teacher_id AND TU.deleted = 0 AND TU.id = #{userId}
LEFT JOIN t_classes TC ON TC.id = TE.classes_id AND TC.deleted = 0
LEFT JOIN t_exam_paper TEP ON TEP.id = TE.exam_paper_id AND TEP.deleted = 0
WHERE
@@ -74,4 +74,34 @@
</if>
</select>
+
+ <select id="studentPage" resultMap="BaseResultMap">
+ SELECT
+ TE.exam_name,
+ TE.exam_paper_id,
+ TE.classes_id,
+ TE.exam_paper_type,
+ TE.exam_place,
+ TE.status,
+ IF(TE.status != 'not_start', IF(TE.status == 'ing', 1, 2), 0) as orderc,
+ TE.start_time,
+ TE.end_time,
+ TE.create_time,
+ TE.teacher_id,
+ TE.id,
+ TC.class_name,
+ TEP.name
+ FROM
+ t_exam TE
+ INNER JOIN t_classes TC ON TC.id = TE.classes_id AND TC.deleted = 0
+ INNER JOIN t_classes_user TCU ON TC.id = TCU.classes_id AND TC.deleted = 0 AND TCU.user_id = #{userId}
+ INNER JOIN t_exam_paper TEP ON TEP.id = TE.exam_paper_id AND TEP.deleted = 0
+ WHERE
+ TE.deleted = 0
+ <if test="query.examName != null and query.examName != ''">
+ AND TE.exam_name like concat('%', #{query.examName}, '%')
+ </if>
+ ORDER BY orderc DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0