From 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 六月 2024 13:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 838b431..4d36d86 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -26,7 +26,7 @@
</sql>
<select id="studentPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageVO">
+ parameterType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_exam_paper_answer
@@ -65,16 +65,57 @@
</select>
- <select id="adminPage" resultMap="BaseResultMap"
- parameterType="com.ycl.jxkg.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 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
<where>
- <if test="subjectId != null">
- and subject_id = #{subjectId}
+ <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>
+ <select id="pageExamPaper" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
+ SELECT
+ a.id,
+ a.name AS paperName,
+ a.score DIV 10 AS systemScore,
+ 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,
+ 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
+ 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
+ <where>
+ a.deleted = 0
+ <if test="subjectId != null and subjectId.size() > 0">
+ AND a.subject_id IN
+ <foreach collection="subjectId" item="item" open="(" separator="," close=")">#{item}</foreach>
+ </if>
+ <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 t.id
+ ORDER BY t.id DESC
+ </select>
+
</mapper>
--
Gitblit v1.8.0