From 71609e40ba719ff40c27bb00d7f5f4af521a80e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index b722404..f83630f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,7 +8,7 @@
<result column="name" property="name" />
<result column="disabled" property="disabled" />
<result column="deleted" property="deleted" />
- <result column="create_dt" property="createDt" />
+ <result column="dt" property="dt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
<result column="id" property="id" />
@@ -21,12 +21,12 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled, deleted,create_dt
+ id, `name`, disabled, deleted,dt
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled,create_dt
+ id, `name`, disabled,dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">
@@ -147,6 +147,12 @@
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
</if>
+ <if test="disable != null and disable != ''">
+ r.disable =#{disabled,jdbcType=BOOLEAN} and
+ </if>
+ <if test="dt != null and dt != ''">
+ DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+ </if>
</trim>
order by id DESC
<trim prefix="limit " >
--
Gitblit v1.8.0