From de2f7fe7f23ac338b7d6997a74b3715e9b1a7cc7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 10:56:18 +0800
Subject: [PATCH] 1、行政区保存功能，修改自动加上行政区级别，及删除标志 2、单点登录中增加了获得所有组织机构的功能，及增加组织机构枚举类型 3、增加农户实体、农户类型实体、分水口实体等相关功能
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 94 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 12 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 29d8fe7..878688d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -3,26 +3,37 @@
<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRoleMapper">
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <!--@mbg.generated-->
- <!--@Table ba_role-->
<result 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"/>
</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>
+
+ <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <collection property="priviList" fetchType="eager" column="{roleId=id}" select="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />
+ </resultMap>
+
<sql id="Base_Column_List">
- <!--@mbg.generated-->
id, name, deleted
+ </sql>
+
+ <sql id="part_Column_List">
+ id, name
</sql>
<select id="selectAll" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" />
+ <include refid="part_Column_List" />
from ba_role
+ where deleted!=1
</select>
- <select id="selectByUserId" resultMap="BaseResultMap">
- select <include refid="Base_Column_List" />
+ <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
@@ -31,16 +42,43 @@
</if>
</select>
+ <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+ select
+ count(*)
+ from ba_role where deleted!=1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null">
+ name like concat('%', #{name}, '%')
+ </if>
+ </trim>
+ </select>
+
+ <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
+ select
+ <include refid="part_Column_List" />
+ from ba_role where deleted!=1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null">
+ name like concat('%', #{name}, '%')
+ </if>
+ </trim>
+ order by id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <!--@mbg.generated-->
- insert into ba_role (id, `name`, deleted
- )
- values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+ insert into ba_role (<include refid="Base_Column_List" />)
+ values (#{id,jdbcType=BIGINT},
+ #{name,jdbcType=VARCHAR},
+ #{deleted, typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, 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">
@@ -61,8 +99,40 @@
#{name,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
- #{deleted,jdbcType=TINYINT},
+ #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</trim>
</insert>
+
+
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ update ba_role
+ <set>
+ <if test="name != null">
+ `name` = #{name,jdbcType=VARCHAR},
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ update ba_role
+ set `name` = #{name,jdbcType=VARCHAR},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ delete from ba_role
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+
+ <delete id="deleteLogicById" parameterType="java.lang.Long">
+ update ba_role set deleted = 1
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0