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/BaDistrictMapper.xml |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
index 356b51d..db51681 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -7,13 +7,16 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <id column="supperId" jdbcType="BIGINT" property="supperId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="num" jdbcType="TINYINT" property="num" />
     <result property="level" column="level" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.pipIrrGlobal.util.DistrictLevel"/>
     <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
   </resultMap>
+
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, supperId, `name`, `level`, deleted
+    id, supperId, `name`, num, `level`, deleted
   </sql>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select 
@@ -21,6 +24,7 @@
     from ba_district
     where id = #{id,jdbcType=BIGINT}
   </select>
+
   <select id="selectByLevel" parameterType="java.lang.Byte" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
@@ -28,6 +32,7 @@
     from ba_district
     where level = #{level,jdbcType=TINYINT}
   </select>
+
   <select id="selectBySupperId" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
@@ -35,16 +40,19 @@
     from ba_district
     where supperId = #{supperId,jdbcType=BIGINT}
   </select>
+
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
     <!--@mbg.generated-->
-    insert into ba_district (id, supperId, `name`, `level`, deleted)
+    insert into ba_district (id, supperId, `name`, num, `level`, deleted)
     values (#{id,jdbcType=BIGINT},
             #{supperId,jdbcType=BIGINT},
             #{name,jdbcType=VARCHAR},
-            #{level,jdbcType=TINYINT},
-            #{deleted,jdbcType=TINYINT}
+            #{num,jdbcType=TINYINT},
+            #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+            #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
     )
   </insert>
+
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
     <!--@mbg.generated-->
     insert into ba_district
@@ -57,6 +65,9 @@
       </if>
       <if test="name != null">
         `name`,
+      </if>
+      <if test="num != null">
+        num,
       </if>
       <if test="level != null">
         `level`,
@@ -75,11 +86,14 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="num != null">
+        #{num,jdbcType=TINYINT},
+      </if>
       <if test="level != null">
-        #{level,jdbcType=TINYINT},
+        #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
       <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
+        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -90,14 +104,17 @@
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="num != null">
+        num = #{num,jdbcType=TINYINT},
+      </if>
       <if test="supperId != null">
         supperId = #{supperId,jdbcType=BIGINT},
       </if>
       <if test="level != null">
-        `level` = #{level,jdbcType=TINYINT},
+        `level` = #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
       <if test="deleted != null">
-        deleted = #{deleted,jdbcType=TINYINT},
+        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -107,8 +124,9 @@
     update ba_district
     set supperId = #{supperId,jdbcType=BIGINT},
         `name` = #{name,jdbcType=VARCHAR},
-        `level` = #{level,jdbcType=TINYINT},
-        deleted = #{deleted,jdbcType=TINYINT}
+        num = #{num,jdbcType=TINYINT},
+        `level` = #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

--
Gitblit v1.8.0