From ad88668b0dc528de1cc982b7d0e146a14767b24e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 18 六月 2024 15:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/QuestionMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 691aa92..2a14509 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -23,8 +23,15 @@
parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO">
SELECT
tq.*,
- CASE WHEN tq.question_type = 1 THEN '鍗曢�夐' WHEN tq.question_type = 2 THEN '澶氶�夐' WHEN tq.question_type = 3 THEN
- '鍒ゆ柇棰�' WHEN tq.question_type = 4 THEN '濉┖棰�' WHEN tq.question_type = 5 THEN '绠�绛旈' END AS questionTypeName,
+ CASE WHEN tq.question_type = 1 THEN '鍗曢�夐'
+ WHEN tq.question_type = 2 THEN '澶氶�夐'
+ WHEN tq.question_type = 3 THEN '鍒ゆ柇棰�'
+ 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
FROM t_question tq
@@ -85,4 +92,18 @@
<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>
+
</mapper>
--
Gitblit v1.8.0