From 126c774854a74f02e5deaee308a7688e0f171aaa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 17:37:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/QuestionMapper.xml | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index dfb80da..59076e6 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -128,33 +128,13 @@
<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 id="export" resultType="com.ycl.jxkg.domain.vo.admin.exam.ExamPaperImportVO">
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>
+ q.*,
+ s.NAME AS SUBJECT
+ FROM t_question q
+ LEFT JOIN t_subject s ON subject_id = s.id
+ ORDER BY q.id
</select>
</mapper>
--
Gitblit v1.8.0