From 437713ee567f25c04f094057a1908b6dc54eeefd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 16:57:29 +0800
Subject: [PATCH] 1、农户类型管理 2、农户管理

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 3b87acc..28fb02a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -27,7 +27,7 @@
     select
     count(*)
     from ba_block
-      <trim prefix="where ">
+      <trim prefix="where " suffixOverrides="and">
         <if test="name != null">
           name like '%#{name,jdbcType=VARCHAR}%' and
         </if>
@@ -38,7 +38,7 @@
           phone = '#{phone,jdbcType=VARCHAR}' and
         </if>
         <if test="area != null">
-          area = #{area,jdbcType=INTEGER}
+          area = #{area,jdbcType=INTEGER} and
         </if>
       </trim>
   </select>
@@ -47,7 +47,7 @@
     select
     <include refid="Base_Column_List" />
     from ba_block
-    <trim prefix="where ">
+    <trim prefix="where " suffixOverrides="and">
       <if test="name != null">
         name like '%#{name,jdbcType=VARCHAR}%' and
       </if>
@@ -58,7 +58,7 @@
         phone = '#{phone,jdbcType=VARCHAR}' and
       </if>
       <if test="area != null">
-        area = #{area,jdbcType=INTEGER}
+        area = #{area,jdbcType=INTEGER} and
       </if>
     </trim>
     order by id DESC
@@ -69,16 +69,6 @@
     </trim>
   </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--@mbg.generated-->
-    delete from ba_block
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteLogicById" parameterType="java.lang.Long">
-    <!--@mbg.generated-->
-    update ba_block set deleted = 1
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
     <!--@mbg.generated-->
     insert into ba_block (id, `name`, `header`, phone, area, color, deleted)
@@ -88,7 +78,7 @@
             #{phone,jdbcType=VARCHAR},
             #{area,jdbcType=INTEGER},
             #{color,jdbcType=VARCHAR},
-            #{deleted,jdbcType=TINYINT})
+            #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
     <!--@mbg.generated-->
@@ -136,7 +126,7 @@
         #{color,jdbcType=VARCHAR},
       </if>
       <if test="deleted != null">
-        #{deleted,jdbcType=TINYINT},
+        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
     </trim>
   </insert>
@@ -160,7 +150,7 @@
         color = #{color,jdbcType=VARCHAR},
       </if>
       <if test="deleted != null">
-        color = #{deleted,jdbcType=TINYINT},
+        color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -173,7 +163,19 @@
       phone = #{phone,jdbcType=VARCHAR},
       area = #{area,jdbcType=INTEGER},
       color = #{color,jdbcType=VARCHAR},
-      deleted = #{deleted,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">
+    <!--@mbg.generated-->
+    delete from ba_block
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteLogicById" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    update ba_block set deleted = 1
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0