From 44aaa355ecf9430f8b182654d03c2914287bcba6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 11:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/QuestionMapper.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 80ee354..074a926 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,29 @@
<foreach collection="questionIds" open="(" item="id" close=")" separator=",">#{id}</foreach>
</select>
+ <select id="selectBySubject" resultType="com.ycl.jxkg.domain.question.RandomQuestionDTO">
+ SELECT
+ id as questionId,question_type
+ FROM
+ t_question
+ WHERE
+ subject_id = #{subjectId}
+ and question_type in
+ <foreach collection="types" item="type" separator="," open="(" close=")">
+ #{type}
+ </foreach>
+ and deleted = 0 and status = 1
+ </select>
+
+ <select id="getRandomQuestion" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ t_question tq
+ WHERE
+ tq.subject_id = #{subjectId}
+ ORDER BY
+ RAND()
+ LIMIT #{num}
+ </select>
</mapper>
--
Gitblit v1.8.0