From 7ab88068ac2ed4d6e3bc59157904965ebd11910d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 七月 2024 09:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/QuestionMapper.xml | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 80ee354..dfb80da 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
@@ -90,4 +92,69 @@
<foreach collection="questionIds" open="(" item="id" close=")" separator=",">#{id}</foreach>
</select>
+ <select id="selectByDifAndSub" resultType="java.lang.Integer">
+ SELECT COUNT(*) FROM t_question
+ <where>
+ deleted = 0 and status = 1
+ <if test="subjectId!=null">and subject_id = #{subjectId}</if>
+ <if test="difficult!=null">AND difficult = #{difficult}</if>
+ <if test="questionType!=null">AND question_type = #{questionType}</if>
+ </where>
+
+ </select>
+
+ <select id="getRandomQuestion" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ t_question tq
+ <where>
+ tq.deleted = 0 and tq.status = 1
+ <if test="subjectId!=null">and tq.subject_id = #{subjectId}</if>
+ <if test="difficult!=null">AND tq.difficult = #{difficult}</if>
+ <if test="questionType!=null">AND tq.question_type = #{questionType}</if>
+ </where>
+ ORDER BY
+ 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