From 6fd2460cc439e64789925e41d7106627d354fcd4 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 14 六月 2024 13:45:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/QuestionMapper.xml | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml index 850f168..d2c122b 100644 --- a/src/main/resources/mapper/QuestionMapper.xml +++ b/src/main/resources/mapper/QuestionMapper.xml @@ -15,13 +15,21 @@ <result column="deleted" jdbcType="BIT" property="deleted"/> </resultMap> <sql id="Base_Column_List"> - id, question_type, subject_id, difficult, correct, content, create_user, status, create_time, deleted + id + , question_type, subject_id, difficult, correct, content, create_user, status, create_time, deleted </sql> - <select id="page" resultType="com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO" parameterType="com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO"> + <select id="page" resultType="com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO" + 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 '璇煶棰�' + END AS questionTypeName, ts.name AS subjectName, tu.real_name AS createUserName FROM t_question tq @@ -36,10 +44,12 @@ and tq.status = #{status} </if> <if test="subjectId != null and subjectId.size() > 0"> - and tq.subject_id in <foreach collection="subjectId" item="item" separator="," open="(" close=")"> #{item} </foreach> + and tq.subject_id in + <foreach collection="subjectId" item="item" separator="," open="(" close=")">#{item}</foreach> </if> <if test="questionType != null and questionType.size() > 0"> - and tq.question_type in <foreach collection="questionType" item="item" separator="," open="(" close=")"> #{item} </foreach> + and tq.question_type in + <foreach collection="questionType" item="item" separator="," open="(" close=")">#{item}</foreach> </if> <if test="content != null and content != ''"> and instr(tq.content, #{content}) @@ -75,6 +85,11 @@ GROUP BY create_time </select> + <select id="getAnswerInfo" resultType="com.ycl.jxkg.domain.entity.Question"> + SELECT id, question_type, correct FROM t_question WHERE id in + <foreach collection="questionIds" open="(" item="id" close=")" separator=",">#{id}</foreach> + </select> + <select id="getQuestionRandom"> SELECT * -- Gitblit v1.8.0