From a180c14ebe5560244f451831d4009423f392369f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 30 十月 2024 21:53:59 +0800
Subject: [PATCH] bug
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperScoreMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
index cc85278..a29bf61 100644
--- a/src/main/resources/mapper/ExamPaperScoreMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -45,13 +45,13 @@
<select id="studentPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
a.*,
- ep.name as paperName
+ ep.name AS paperName
FROM t_exam_paper_score a
INNER JOIN t_exam_paper ep ON ep.id = paper_id AND ep.deleted = 0
<where>
- and user_id = #{createUser}
+ AND user_id = #{createUser}
<if test="examName != null and examName != ''">
- and INSTR(exam_name, #{examName})
+ AND INSTR(exam_name, #{examName})
</if>
</where>
</select>
@@ -97,14 +97,22 @@
<select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
SELECT
- a.*, b.real_name AS userName, c.name as paperName
+ a.id, a.exam_name, a.score, a.total_score, a.question_correct, a.question_count, a.do_time, a.status, IF(a.status = 0, a.submit_time, '缂鸿��') AS submitTime, b.real_name AS userName, c.name AS paperName
FROM t_exam_paper_score a
INNER JOIN t_user b ON a.user_id = b.id AND b.deleted = 0
INNER JOIN t_exam_paper c ON a.paper_id = c.id AND c.deleted = 0
<where>
- exam_id = #{examId}
+ <if test="examId != null and examId != ''">
+ AND a.exam_id = #{examId}
+ </if>
+ <if test="userId != null and userId != ''">
+ AND a.user_id = #{userId}
+ </if>
<if test="userName != null and userName != ''">
AND INSTR(b.real_name, #{userName})
+ </if>
+ <if test="examName != null and examName != ''">
+ AND INSTR(a.exam_name, #{examName})
</if>
</where>
</select>
@@ -121,15 +129,14 @@
b.name AS subjectName,
c.real_name AS userName,
IFNULL(COUNT(DISTINCT d.id), 0) AS personAnswerNum,
- IFNULL(COUNT(DISTINCT f.id), 0) AS personTotalNum,
+ IFNULL(COUNT(DISTINCT e.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.deleted = 0
LEFT JOIN t_subject b ON a.subject_id = b.id AND b.deleted = 0
LEFT JOIN t_user c ON t.teacher_id = c.id AND c.deleted = 0
- LEFT JOIN t_exam_paper_score d ON t.id = d.exam_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
+ LEFT JOIN t_exam_paper_score d ON t.id = d.exam_id AND d.deleted = 0
+ LEFT JOIN t_classes_user e ON t.classes_id = e.classes_id AND e.deleted = 0
<where>
a.deleted = 0
<if test="subjectId != null and subjectId.size() > 0">
@@ -147,4 +154,17 @@
ORDER BY t.id DESC
</select>
+ <select id="pageUser" resultType="com.ycl.jxkg.domain.vo.student.exampaper.UserAnswerPageResponseVO">
+ SELECT a.id, a.real_name AS userName, COUNT(b.id) AS examCount
+ FROM t_user a
+ LEFT JOIN t_exam_paper_score b ON a.id = b.user_id AND b.deleted = 0
+ <where>
+ a.deleted = 0 AND a.role = 1
+ <if test="name != null and name != ''">
+ AND INSTR(a.real_name, #{name})
+ </if>
+ </where>
+ GROUP BY a.id
+ </select>
+
</mapper>
--
Gitblit v1.8.0