From 3179257af77acbc229fe873de7495e2d3f8dfb6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 05 七月 2024 13:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/resources/mapper/QuestionMapper.xml |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 250f3a0..dfb80da 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -118,4 +118,43 @@
         RAND()
         LIMIT #{num}
     </select>
+
+    <resultMap id="exportDataMap"  type="com.ycl.jxkg.domain.vo.admin.exam.QuestionExportData">
+        <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"/>
+        <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
+    </resultMap>
+
+    <resultMap id="exportMap" type="com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO">
+        <result column="question_type" property="questionType"/>
+        <result column="title" property="title"/>
+        <result column="analyze" property="analyze"/>
+        <result column="score" property="score"/>
+        <result column="difficult" property="difficult"/>
+        <result column="content" property="questionContent"/>
+        <result column="score" property="score"/>
+        <result column="correct" property="correct"/>
+        <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
+    </resultMap>
+
+    <select id="export" resultMap="exportMap">
+        SELECT
+        DISTINCT
+        q.*, ttc.content
+        FROM
+        t_question q
+        INNER JOIN t_ex ttc on q.info_text_content_id = ttc.id AND q.deleted = 0
+        <where>
+            <if test="query.examPaperId != null">
+                AND tqs.subject_id IN
+                <foreach collection="query.subjectIds" open="(" separator="," close=")" item="subjectId">
+                    #{subjectId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>

--
Gitblit v1.8.0