From 8f77fb7d7b71c49ae17bd84aad6e12aeb5859c3b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 12 一月 2024 14:15:02 +0800
Subject: [PATCH] 2024-01-12 朱宝民 返回的分水房列表中增加分水房编号
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 160 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 128 insertions(+), 32 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index bf3f4a3..c9c866e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,51 +1,42 @@
<?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.dy.pipIrrGlobal.daoBa.BaRoleMapper">
-
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <result column="id" jdbcType="BIGINT" property="id" />
+ <!--@mbg.generated-->
+ <!--@Table ba_role-->
+ <id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
+ <result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
-
- <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <result column="id" jdbcType="BIGINT" property="id" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- </resultMap>
-
<sql id="Base_Column_List">
- id, name, deleted
+ <!--@mbg.generated-->
+ id, `name`, `operator`, operate_dt, deleted
</sql>
-
- <sql id="part_Column_List">
- id, name
- </sql>
-
- <select id="selectAll" resultMap="BaseResultMap">
- select
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
<include refid="Base_Column_List" />
from ba_role
+ where id = #{id,jdbcType=BIGINT}
</select>
-
- <select id="selectByUserId" resultMap="partResultMap">
- select <include refid="part_Column_List" />
- from ba_role r
- inner join ba_user_role ur on r.id = ur.roleId
- where r.deleted != 1
- <if test="userId != null">
- and ur.userId = #{userId,jdbcType=BIGINT}
- </if>
- </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from ba_role
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
- insert into ba_role (id, `name`, deleted)
- values (#{id,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR},
- #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
- )
+ <!--@mbg.generated-->
+ insert into ba_role (id, `name`, `operator`,
+ operate_dt, deleted)
+ values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operateDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
insert into ba_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -53,6 +44,12 @@
</if>
<if test="name != null">
`name`,
+ </if>
+ <if test="operator != null">
+ `operator`,
+ </if>
+ <if test="operateDt != null">
+ operate_dt,
</if>
<if test="deleted != null">
deleted,
@@ -65,9 +62,108 @@
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
+ <if test="operator != null">
+ #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
+ </if>
<if test="deleted != null">
#{deleted,jdbcType=TINYINT},
</if>
</trim>
</insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
+ update ba_role
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="operator != null">
+ `operator` = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <!--@mbg.generated-->
+ update ba_role
+ set `name` = #{name,jdbcType=VARCHAR},
+ `operator` = #{operator,jdbcType=BIGINT},
+ operate_dt = #{operateDt,jdbcType=TIMESTAMP},
+ deleted = #{deleted,jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!--鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺锛屾坊鍔犺鑹叉椂鍒ゆ柇鏄惁閲嶅悕-->
+ <select id="getRecordCountByName" resultType="java.lang.Integer">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ba_role
+ WHERE name = #{roleName}
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
+ <select id="getRecordCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ba_role role
+ LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+ <where>
+ AND role.deleted = 0
+
+ <if test = "roleId != null and roleId > 0">
+ AND role.id = ${roleId}
+ </if>
+
+ <if test = "roleName != null and roleName !=''">
+ AND role.name LIKE CONCAT('%',#{roleName},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
+ <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
+ SELECT
+ (@i:=@i+1) AS id,
+ t.* FROM
+ (
+ SELECT
+ role.id AS roleId,
+ role.name AS roleName,
+ per.permissions,
+ (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,
+ role.operate_dt AS operateDt
+ FROM ba_role role
+ LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+ <where>
+ AND role.deleted = 0
+
+ <if test = "roleId != null and roleId > 0">
+ AND role.id = ${roleId}
+ </if>
+
+ <if test = "roleName != null and roleName !=''">
+ AND role.name LIKE CONCAT('%',#{roleName},'%')
+ </if>
+ </where>
+ ORDER BY role.operate_dt DESC
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${pageCurr}, ${pageSize}
+ </if>
+ ) t
+ , (SELECT @i:=0) AS itable
+ </select>
+
+ <!--鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄-->
+ <update id="deleteRoleById">
+ UPDATE ba_role SET deleted = 1 WHERE id = ${roleId}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0