From db7ff10c4090564126bf78447fb038406812f321 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 04 六月 2024 11:54:58 +0800
Subject: [PATCH] feat:题目查询、新增,内容直接存题目表

---
 src/main/resources/mapper/QuestionMapper.xml |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index f10a52b..7a5a642 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -9,7 +9,7 @@
         <result column="grade_level" jdbcType="INTEGER" property="gradeLevel"/>
         <result column="difficult" jdbcType="INTEGER" property="difficult"/>
         <result column="correct" jdbcType="VARCHAR" property="correct"/>
-        <result column="info_text_content_id" jdbcType="INTEGER" property="infoTextContentId"/>
+        <result column="content" jdbcType="VARCHAR" property="content"/>
         <result column="create_user" jdbcType="INTEGER" property="createUser"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
@@ -17,32 +17,36 @@
     </resultMap>
     <sql id="Base_Column_List">
         id
-        , question_type, subject_id, score, grade_level, difficult, correct, info_text_content_id,
+        , question_type, subject_id, score, grade_level, difficult, correct, content,
     create_user, status, create_time, deleted
     </sql>
 
 
-    <select id="page" resultMap="BaseResultMap" 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
-        <include refid="Base_Column_List"/>
-        FROM t_question
+        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,
+        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 deleted=0
+            and tq.deleted=0
             <if test="id != null ">
-                and id= #{id}
+                and tq.id= #{id}
             </if>
             <if test="level != null ">
-                and grade_level= #{level}
+                and tq.grade_level= #{level}
             </if>
             <if test="subjectId != null ">
-                and subject_id= #{subjectId}
+                and tq.subject_id= #{subjectId}
             </if>
             <if test="questionType != null ">
-                and question_type= #{questionType}
+                and tq.question_type= #{questionType}
             </if>
             <if test="content != null">
-                and info_text_content_id in (SELECT id FROM t_text_content WHERE content like concat('%',#{content},'%')
-                )
+                and instr(tq.content, #{content})
             </if>
         </where>
     </select>

--
Gitblit v1.8.0