From e49d6551b73457f5dde2ea1d5e267028525ba05b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 09:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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/resources/mapper/QuestionMapper.xml | 2 ++
src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java | 4 +++-
src/main/java/com/ycl/jxkg/domain/entity/Question.java | 2 +-
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 3 +++
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 10 +++++++---
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 5 +++++
8 files changed, 28 insertions(+), 5 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/java/com/ycl/jxkg/enums/QuestionTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
index d7b9232..2be650a 100644
--- a/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
@@ -10,7 +10,9 @@
TrueFalse(3, "鍒ゆ柇棰�"),
GapFilling(4, "濉┖棰�"),
ShortAnswer(5, "绠�绛旈"),
- Calculation(6,"璁＄畻棰�");
+ Audio(6,"璇煶棰�"),
+ Calculate(7,"璁＄畻棰�"),
+ Analysis(8,"鍒嗘瀽棰�");
Integer code;
String name;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 28d4b66..6dd2954 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
@@ -16,6 +18,9 @@
import com.ycl.jxkg.domain.question.QuestionItemObject;
import com.ycl.jxkg.domain.question.RandomQuestionDTO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.enums.QuestionTypeEnum;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 9e6a0d2..4a737c4 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -105,6 +105,7 @@
switch (questionTypeEnum) {
case SingleChoice:
case TrueFalse:
+ case Audio:
questionEditRequestVO.setCorrect(question.getCorrect());
break;
case MultipleChoice:
@@ -115,6 +116,8 @@
questionEditRequestVO.setCorrectArray(correctContent);
break;
case ShortAnswer:
+ case Calculate:
+ case Analysis:
questionEditRequestVO.setCorrect(questionObject.getCorrect());
break;
default:
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>
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index fd64749..2a14509 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -29,6 +29,8 @@
WHEN tq.question_type = 4 THEN '濉┖棰�'
WHEN tq.question_type = 5 THEN '绠�绛旈'
WHEN tq.question_type = 6 THEN '璇煶棰�'
+ WHEN tq.question_type = 7 THEN '璁＄畻棰�'
+ WHEN tq.question_type = 8 THEN '鍒嗘瀽棰�'
END AS questionTypeName,
ts.name AS subjectName,
tu.real_name AS createUserName
--
Gitblit v1.8.0