From d42531771812f978d4109e26f80070ff5a6fcd2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 六月 2024 09:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 82d8832..4185580 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 DIV 10 AS user_score, paper_score DIV 10 AS 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>
@@ -84,10 +85,11 @@
SELECT
a.id,
a.name AS paperName,
- a.score AS systemScore,
+ 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,
--
Gitblit v1.8.0