From 25fb8f6f2580a618ea84bcb30ae108ab2fa3c205 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 25 六月 2024 16:51:01 +0800
Subject: [PATCH] 考试查询增加状态,开始考试校验考试状态

---
 src/main/resources/mapper/ExamMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml
index a644554..fb7d106 100644
--- a/src/main/resources/mapper/ExamMapper.xml
+++ b/src/main/resources/mapper/ExamMapper.xml
@@ -85,7 +85,7 @@
             TE.exam_paper_type,
             TE.exam_place,
             TE.status,
-            IF(TE.status != 'not_start', IF(TE.status == 'ing', 1, 2), 0) as orderc,
+            IF(TE.status != 'not_start', IF(TE.status = 'ing', 2, 1), 0) as orderc,
             TE.start_time,
             TE.end_time,
             TE.create_time,
@@ -95,7 +95,7 @@
             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 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 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
@@ -103,7 +103,10 @@
             <if test="query.examName != null and query.examName != ''">
                 AND TE.exam_name like concat('%', #{query.examName}, '%')
             </if>
-        ORDER BY orderc DESC
+            <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