From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/SubjectMapper.xml | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index b7d0cf9..b253f94 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -4,21 +4,22 @@
<resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Subject">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
- <result column="level" jdbcType="INTEGER" property="level"/>
- <result column="level_name" jdbcType="VARCHAR" property="levelName"/>
<result column="item_order" jdbcType="INTEGER" property="itemOrder"/>
+ <result column="status" jdbcType="INTEGER" property="status"/>
+ <result column="create_user" jdbcType="INTEGER" property="createUser"/>
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
</resultMap>
<sql id="Base_Column_List">
- id
- , name, level, level_name, item_order, deleted
+ id, name, item_order, deleted, status, create_user, create_time
</sql>
<select id="getSubjectByLevel" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
- from t_subject where level= #{level}
+ from t_subject
+ where deleted = 0 and status = 1
order by item_order
</select>
@@ -27,19 +28,21 @@
select
<include refid="Base_Column_List"/>
from t_subject
+ where deleted = 0 and status = 1
+ order by item_order
</select>
- <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO">
+ <select id="page" resultType="com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO" parameterType="com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_subject
<where>
- and deleted=0
- <if test="id != null ">
- and id= #{id}
+ and deleted = 0
+ <if test="status != null">
+ and status = #{status}
</if>
- <if test="level != null ">
- and level= #{level}
+ <if test="name != null and name != ''">
+ and instr(name, #{name})
</if>
</where>
</select>
--
Gitblit v1.8.0