From f5379a7100a20f538092eb839b2f4c9f6d3a1b45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:06:10 +0800
Subject: [PATCH] 上课记录Bug修复
---
src/main/resources/mapper/ExamMapper.xml | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml
index 4961fc1..7a3a092 100644
--- a/src/main/resources/mapper/ExamMapper.xml
+++ b/src/main/resources/mapper/ExamMapper.xml
@@ -14,13 +14,11 @@
<result column="end_time" property="endTime" />
<result column="create_time" property="createTime" />
<result column="teacher_id" property="teacherId" />
+ <result column="class_name" property="className" />
+ <result column="name" property="examPaperName" />
+ <result column="isContinue" property="isContinue" />
+ <result column="submitStatus" property="submitStatus" />
</resultMap>
-
-
-
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
@@ -54,11 +52,60 @@
TE.end_time,
TE.create_time,
TE.teacher_id,
- TE.id
+ TE.id,
+ TC.class_name,
+ TEP.name
FROM
t_exam TE
+ 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
TE.deleted = 0
+ <if test="query.examName != null and query.examName != ''">
+ AND TE.exam_name like concat('%', #{query.examName}, '%')
+ </if>
+ <if test="query.classesId != null">
+ AND TE.classes_id = #{query.classesId}
+ </if>
+ ORDER BY
+ TE.create_time DESC
+ </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', 2, 1), 0) as orderc,
+ TE.start_time,
+ TE.end_time,
+ TE.create_time,
+ TE.teacher_id,
+ TE.id,
+ TC.class_name,
+ TEP.name,
+ TEST.status as submitStatus,
+ (SELECT IF(COUNT(*) > 0, true, false) FROM t_exam_submit_temp WHERE user_id = #{userId} AND status = 'temp') as isContinue
+ FROM
+ t_exam TE
+ INNER JOIN t_classes TC ON TC.id = TE.classes_id AND TC.deleted = 0 AND TC.status = 'normal'
+ INNER JOIN t_classes_user TCU ON TC.id = TCU.classes_id And TCU.deleted = 0 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
+ LEFT JOIN t_exam_submit_temp TEST ON TEST.exam_id = TE.id
+ WHERE
+ TE.deleted = 0 and TEST.deleted !=1
+ <if test="query.examName != null and query.examName != ''">
+ AND TE.exam_name like concat('%', #{query.examName}, '%')
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND TE.status = #{query.status}
+ </if>
+ ORDER BY orderc, TE.create_time DESC
</select>
</mapper>
--
Gitblit v1.8.0