From 5f7716b3b9d60bf7e289ba2261730b4185210f57 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 13 六月 2024 17:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java |    4 ++++
 src/main/resources/mapper/QuestionMapper.xml                                   |    9 +++++++--
 src/main/java/com/ycl/jxkg/domain/entity/Question.java                         |   18 ++++++++++++++++++
 src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java               |    7 +++++++
 src/main/resources/mapper/ExamPaperAnswerMapper.xml                            |    1 -
 5 files changed, 36 insertions(+), 3 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 4075d4f..278d717 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Question.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
@@ -24,6 +24,12 @@
     private Integer questionType;
 
     /**
+     * 棰樼洰
+     */
+    @TableField("title")
+    private String title;
+
+    /**
      * 瀛︾
      */
     @TableField("subject_id")
@@ -48,6 +54,18 @@
     private String content;
 
     /**
+     * 璇煶鏂囦欢
+     */
+    @TableField("audio_file")
+    private String audioFile;
+
+    /**
+     * 鍘熷鏂囦欢鍚嶇О
+     */
+    @TableField("original_file")
+    private String originalFile;
+
+    /**
      * 鍒涘缓浜�
      */
     @TableField("create_user")
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java
index 01de229..05dab93 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionEditRequestVO.java
@@ -39,4 +39,8 @@
 
     private Integer itemOrder;
 
+    private String audioFile;
+
+    private String originalFile;
+
 }
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 758c8c1..9e6a0d2 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -18,6 +18,7 @@
 import com.ycl.jxkg.service.QuestionService;
 import com.ycl.jxkg.utils.DateTimeUtil;
 import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.HtmlUtil;
 import com.ycl.jxkg.utils.JsonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -60,6 +61,9 @@
         question.setDifficult(model.getDifficult());
         question.setContent(questionObject);
         question.setCreateUser(userId);
+        question.setTitle(HtmlUtil.clear(model.getTitle()));
+        question.setAudioFile(model.getAudioFile());
+        question.setOriginalFile(model.getOriginalFile());
         questionMapper.insert(question);
         return question;
     }
@@ -74,6 +78,9 @@
         //棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
         String questionObject = setQuestionInfoFromVM(model);
         question.setContent(questionObject);
+        question.setTitle(HtmlUtil.clear(model.getTitle()));
+        question.setAudioFile(model.getAudioFile());
+        question.setOriginalFile(model.getOriginalFile());
         questionMapper.updateById(question);
         return question;
     }
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index f5f8e64..01be319 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -86,7 +86,6 @@
         a.id,
         a.name AS paperName,
         a.score DIV 10 AS systemScore,
-        a.question_count,
         a.subject_id,
         a.paper_type,
         a.suggest_time,
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 691aa92..80ee354 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -23,8 +23,13 @@
             parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO">
         SELECT
         tq.*,
-        CASE WHEN tq.question_type = 1 THEN '鍗曢�夐' WHEN tq.question_type = 2 THEN '澶氶�夐' WHEN tq.question_type = 3 THEN
-        '鍒ゆ柇棰�' WHEN tq.question_type = 4 THEN '濉┖棰�' WHEN tq.question_type = 5 THEN '绠�绛旈' END AS questionTypeName,
+        CASE WHEN tq.question_type = 1 THEN '鍗曢�夐'
+        WHEN tq.question_type = 2 THEN '澶氶�夐'
+        WHEN tq.question_type = 3 THEN '鍒ゆ柇棰�'
+        WHEN tq.question_type = 4 THEN '濉┖棰�'
+        WHEN tq.question_type = 5 THEN '绠�绛旈'
+        WHEN tq.question_type = 6 THEN '璇煶棰�'
+        END AS questionTypeName,
         ts.name AS subjectName,
         tu.real_name AS createUserName
         FROM t_question tq

--
Gitblit v1.8.0