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 | 72 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 7a5a642..074a926 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.QuestionMapper">
+
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Question">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="question_type" jdbcType="INTEGER" property="questionType"/>
<result column="subject_id" jdbcType="INTEGER" property="subjectId"/>
- <result column="score" jdbcType="INTEGER" property="score"/>
- <result column="grade_level" jdbcType="INTEGER" property="gradeLevel"/>
<result column="difficult" jdbcType="INTEGER" property="difficult"/>
<result column="correct" jdbcType="VARCHAR" property="correct"/>
<result column="content" jdbcType="VARCHAR" property="content"/>
@@ -17,35 +16,44 @@
</resultMap>
<sql id="Base_Column_List">
id
- , question_type, subject_id, score, grade_level, difficult, correct, content,
- create_user, status, create_time, deleted
+ , 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 '璇煶棰�'
+ 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
LEFT JOIN t_subject ts ON tq.subject_id = ts.id
LEFT JOIN t_user tu ON tq.create_user = tu.id
<where>
- and tq.deleted=0
- <if test="id != null ">
- and tq.id= #{id}
+ and tq.deleted = 0
+ <if test="id != null">
+ and tq.id = #{id}
</if>
- <if test="level != null ">
- and tq.grade_level= #{level}
+ <if test="status != null">
+ and tq.status = #{status}
</if>
- <if test="subjectId != null ">
- and tq.subject_id= #{subjectId}
+ <if test="subjectId != null and subjectId.size() > 0">
+ and tq.subject_id in
+ <foreach collection="subjectId" item="item" separator="," open="(" close=")">#{item}</foreach>
</if>
- <if test="questionType != null ">
- and tq.question_type= #{questionType}
+ <if test="questionType != null and questionType.size() > 0">
+ and tq.question_type in
+ <foreach collection="questionType" item="item" separator="," open="(" close=")">#{item}</foreach>
</if>
- <if test="content != null">
+ <if test="content != null and content != ''">
and instr(tq.content, #{content})
</if>
</where>
@@ -79,4 +87,34 @@
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="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