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 |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml
index fb7d106..7a3a092 100644
--- a/src/main/resources/mapper/ExamMapper.xml
+++ b/src/main/resources/mapper/ExamMapper.xml
@@ -16,13 +16,9 @@
         <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
@@ -92,14 +88,17 @@
             TE.teacher_id,
             TE.id,
             TC.class_name,
-            TEP.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 TC.deleted = 0 AND TCU.user_id = #{userId}
+        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
+            TE.deleted = 0 and TEST.deleted !=1
             <if test="query.examName != null and query.examName != ''">
                 AND TE.exam_name like concat('%', #{query.examName}, '%')
             </if>

--
Gitblit v1.8.0