From 44aaa355ecf9430f8b182654d03c2914287bcba6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 11:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 9ae525b..e40180e 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -67,11 +67,10 @@
<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 userScore, paper_score DIV 10 AS paperScore,
+ a.id , exam_paper_id, paper_name, paper_type, system_score, user_score, paper_score,
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}
@@ -86,18 +85,20 @@
SELECT
a.id,
a.name AS paperName,
- a.score DIV 10 AS systemScore,
- a.question_count,
+ a.score AS systemScore,
+ a.num as questionCount,
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(DISTINCT d.id), 0) AS personAnswerNum,
+ IFNULL(COUNT(DISTINCT 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_user c ON t.teacher_id = c.id
LEFT JOIN t_exam_paper_answer d ON a.id = d.exam_paper_id
LEFT JOIN t_exam_paper_classes e ON a.id = e.exam_paper_id
LEFT JOIN t_classes_user f ON e.classes_id = f.classes_id
@@ -110,9 +111,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