From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/QuestionMapper.xml | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index fd64749..250f3a0 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,18 +92,30 @@
<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 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>
</mapper>
--
Gitblit v1.8.0