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 | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 82d8832..e40180e 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -65,17 +65,18 @@
</select>
- <select id="adminPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO">
+ <select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- <include refid="Base_Column_List"/>
- FROM t_exam_paper_answer
+ 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
<where>
- <if test="subjectId != null and subjectId.size() > 0">
- AND subject_id IN
- <foreach collection="subjectId" item="item" open="(" separator="," close=")">#{item}</foreach>
- </if>
<if test="examPaperId != null">
AND exam_paper_id = #{examPaperId}
+ </if>
+ <if test="userName != null and userName != ''">
+ AND INSTR(b.real_name, #{userName})
</if>
</where>
</select>
@@ -85,16 +86,19 @@
a.id,
a.name AS paperName,
a.score AS systemScore,
- a.question_count,
+ 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
@@ -107,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