From d4daa1ea31db6fd421c0e86bab178a9f3b512141 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 23 九月 2024 18:02:54 +0800
Subject: [PATCH] 使用新导入

---
 src/main/resources/mapper/QuestionMapper.xml |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 5207f9b..94c2295 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -273,6 +273,8 @@
         DISTINCT
         q.id,
         q.question_type,
+        q.score,
+        q.difficult,
         q.correct,
         ttc.content
         FROM
@@ -289,12 +291,14 @@
         </where>
     </select>
 
-    <resultMap id="exportDataMap"  type="com.mindskip.xzs.vo.QuestionExportData">
+    <resultMap id="exportDataMap"  type="com.mindskip.xzs.vo.QuestionImportVO">
         <result column="question_type" property="questionType"/>
         <result column="title" property="title"/>
         <result column="analyze" property="analyze"/>
-        <result column="content" property="content"/>
-        <result column="correct" property="answer"/>
+        <result column="content" property="questionContent"/>
+        <result column="correct" property="correct"/>
+        <result column="score" property="score"/>
+        <result column="difficult" property="difficult"/>
         <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
     </resultMap>
 
@@ -375,11 +379,22 @@
 
     <select id="countQuestionByTitle" resultType="integer">
         SELECT
-               COUNT(q.id)
+               DISTINCT q.id
         FROM
              t_question q
                  INNER JOIN t_text_content d on q.info_text_content_id = d.id
         WHERE JSON_VALUE(d.content, '$.titleContent') = #{title} AND q.deleted = 0
     </select>
 
+    <select id="countQuestionByTitleAndSubject" resultType="com.mindskip.xzs.vo.QuestionSubjectVO">
+        SELECT
+               s.subject_id, s.question_id
+        FROM
+             t_question q
+                 INNER JOIN t_text_content d on q.info_text_content_id = d.id
+                 INNER JOIN t_question_subject s ON q.id = s.question_id
+        WHERE
+            JSON_VALUE(d.content, '$.titleContent') = #{title} AND s.subject_id = #{subjectId} AND q.deleted = 0
+    </select>
+
 </mapper>

--
Gitblit v1.8.0