From b972a9478d9c08ed25b9e608efc743fe06c5ace0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 13 六月 2024 09:21:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 4185580..f5f8e64 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -67,7 +67,7 @@
<select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- a.id , exam_paper_id, paper_name, paper_type, system_score, user_score DIV 10 AS user_score, paper_score DIV 10 AS paper_score,
+ a.id , exam_paper_id, paper_name, paper_type, system_score, user_score DIV 10 AS userScore, paper_score DIV 10 AS paperScore,
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
@@ -95,6 +95,7 @@
IFNULL(COUNT(d.id), 0) AS personAnswerNum,
IFNULL(COUNT(f.id), 0) AS personTotalNum
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
--
Gitblit v1.8.0