From 5fecb27dcfafa8f1e3218e56912a082ce219d9a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 09:26:56 +0800
Subject: [PATCH] 计算枚举名统一

---
 src/main/resources/mapper/ExamPaperAnswerMapper.xml |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 9ae525b..4d36d86 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -71,7 +71,6 @@
         question_correct, question_count, do_time, a.status, create_user, a.create_time, b.real_name AS userName
         FROM t_exam_paper_answer a
         LEFT JOIN t_user b ON a.create_user = b.id
-        INNER JOIN t.exam c ON a.exam_paper_id = c.exam_paper_id AND c.status = 'finished'
         <where>
             <if test="examPaperId != null">
                 AND exam_paper_id = #{examPaperId}
@@ -87,15 +86,16 @@
         a.id,
         a.name AS paperName,
         a.score DIV 10 AS systemScore,
-        a.question_count,
         a.subject_id,
         a.paper_type,
         a.suggest_time,
         b.name AS subjectName,
         c.real_name AS userName,
         IFNULL(COUNT(d.id), 0) AS personAnswerNum,
-        IFNULL(COUNT(f.id), 0) AS personTotalNum
+        IFNULL(COUNT(f.id), 0) AS personTotalNum,
+        t.exam_name
         FROM t_exam_paper a
+        INNER JOIN t_exam t ON a.id = t.exam_paper_id AND t.status = 'finished' AND t.deleted = 0
         LEFT JOIN t_subject b ON a.subject_id = b.id
         LEFT JOIN t_user c ON a.create_user = c.id
         LEFT JOIN t_exam_paper_answer d ON a.id = d.exam_paper_id
@@ -110,9 +110,12 @@
             <if test="name != null and name != ''">
                 AND INSTR(a.name, #{name})
             </if>
+            <if test="examName != null and examName != ''">
+                AND INSTR(t.exam_name, #{examName})
+            </if>
         </where>
-        GROUP BY a.id
-        ORDER BY a.id DESC
+        GROUP BY t.id
+        ORDER BY t.id DESC
     </select>
 
 </mapper>

--
Gitblit v1.8.0