From 37279beff7ecc26a3b7333ad01c5274f17abd647 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 14 六月 2024 15:44:35 +0800
Subject: [PATCH] refactor：成绩管理
---
src/main/java/com/ycl/jxkg/domain/vo/admin/paper/ExamPaperAnswerPageRequestVO.java | 2 ++
src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerPageResponseVO.java | 5 +++++
src/main/java/com/ycl/jxkg/domain/entity/Question.java | 2 +-
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 10 +++++++---
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Question.java b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
index 278d717..5cbca4b 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Question.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
@@ -18,7 +18,7 @@
/**
- * 1.鍗曢�夐 2.澶氶�夐 3.鍒ゆ柇棰� 4.濉┖棰� 5.绠�绛旈
+ * 棰樼洰绫诲瀷 1.鍗曢�夐 2.澶氶�夐 3.鍒ゆ柇棰� 4.濉┖棰� 5.绠�绛旈 6.璇煶棰� 7.璁＄畻棰� 8.鍒嗘瀽棰�
*/
@TableField("question_type")
private Integer questionType;
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/paper/ExamPaperAnswerPageRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/paper/ExamPaperAnswerPageRequestVO.java
index 84dbfad..d150342 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/paper/ExamPaperAnswerPageRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/paper/ExamPaperAnswerPageRequestVO.java
@@ -16,4 +16,6 @@
private String userName;
+ private String examName;
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerPageResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerPageResponseVO.java
index 447fa9f..f973851 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerPageResponseVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerPageResponseVO.java
@@ -48,4 +48,9 @@
*/
private Integer suggestTime;
+ /**
+ * 鑰冭瘯鍚嶇О
+ */
+ private String examName;
+
}
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 01be319..4d36d86 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -92,7 +92,8 @@
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(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
@@ -109,9 +110,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