From 7fd0771bbebafa36bc007ceb581cdaab4d290c82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 09:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/QuestionMapper.xml | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 7a5a642..c0266f0 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"/>
@@ -16,11 +15,8 @@
<result column="deleted" jdbcType="BIT" property="deleted"/>
</resultMap>
<sql id="Base_Column_List">
- id
- , question_type, subject_id, score, grade_level, 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
@@ -32,20 +28,20 @@
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>
--
Gitblit v1.8.0