From 6f84d84b9a00f44a155f45d72c796b9a744c5eb0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 十一月 2023 09:43:14 +0800
Subject: [PATCH] 重新push TypeConversionEnum

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index ed7f77c..3aecb4f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -6,10 +6,10 @@
     <!--@Table ba_divide-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="countyId" jdbcType="BIGINT" property="countyid" />
-    <result column="townId" jdbcType="BIGINT" property="townid" />
-    <result column="villageId" jdbcType="BIGINT" property="villageid" />
-    <result column="blockId" jdbcType="BIGINT" property="blockid" />
+    <result column="countyId" jdbcType="BIGINT" property="countyId" />
+    <result column="townId" jdbcType="BIGINT" property="townId" />
+    <result column="villageId" jdbcType="BIGINT" property="villageId" />
+    <result column="blockId" jdbcType="BIGINT" property="blockId" />
     <result column="villages" jdbcType="VARCHAR" property="villages" />
     <result column="area" jdbcType="FLOAT" property="area" />
     <result column="header" jdbcType="VARCHAR" property="header" />
@@ -31,11 +31,6 @@
     from ba_divide
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    <!--@mbg.generated-->
-    delete from ba_divide
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
     <!--@mbg.generated-->
     insert into ba_divide (id, `name`, countyId, 
@@ -43,8 +38,8 @@
       villages, area, `header`, 
       phone, lng, lat, remark, 
       deleted)
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{countyid,jdbcType=BIGINT}, 
-      #{townid,jdbcType=BIGINT}, #{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{countyId,jdbcType=BIGINT}, 
+      #{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT}, #{blockId,jdbcType=BIGINT}, 
       #{villages,jdbcType=VARCHAR}, #{area,jdbcType=FLOAT}, #{header,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}, 
       #{deleted,jdbcType=TINYINT})
@@ -59,16 +54,16 @@
       <if test="name != null">
         `name`,
       </if>
-      <if test="countyid != null">
+      <if test="countyId != null">
         countyId,
       </if>
-      <if test="townid != null">
+      <if test="townId != null">
         townId,
       </if>
-      <if test="villageid != null">
+      <if test="villageId != null">
         villageId,
       </if>
-      <if test="blockid != null">
+      <if test="blockId != null">
         blockId,
       </if>
       <if test="villages != null">
@@ -103,17 +98,17 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="countyid != null">
-        #{countyid,jdbcType=BIGINT},
+      <if test="countyId != null">
+        #{countyId,jdbcType=BIGINT},
       </if>
-      <if test="townid != null">
-        #{townid,jdbcType=BIGINT},
+      <if test="townId != null">
+        #{townId,jdbcType=BIGINT},
       </if>
-      <if test="villageid != null">
-        #{villageid,jdbcType=BIGINT},
+      <if test="villageId != null">
+        #{villageId,jdbcType=BIGINT},
       </if>
-      <if test="blockid != null">
-        #{blockid,jdbcType=BIGINT},
+      <if test="blockId != null">
+        #{blockId,jdbcType=BIGINT},
       </if>
       <if test="villages != null">
         #{villages,jdbcType=VARCHAR},
@@ -148,17 +143,17 @@
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="countyid != null">
-        countyId = #{countyid,jdbcType=BIGINT},
+      <if test="countyId != null">
+        countyId = #{countyId,jdbcType=BIGINT},
       </if>
-      <if test="townid != null">
-        townId = #{townid,jdbcType=BIGINT},
+      <if test="townId != null">
+        townId = #{townId,jdbcType=BIGINT},
       </if>
-      <if test="villageid != null">
-        villageId = #{villageid,jdbcType=BIGINT},
+      <if test="villageId != null">
+        villageId = #{villageId,jdbcType=BIGINT},
       </if>
-      <if test="blockid != null">
-        blockId = #{blockid,jdbcType=BIGINT},
+      <if test="blockId != null">
+        blockId = #{blockId,jdbcType=BIGINT},
       </if>
       <if test="villages != null">
         villages = #{villages,jdbcType=VARCHAR},
@@ -191,10 +186,10 @@
     <!--@mbg.generated-->
     update ba_divide
     set `name` = #{name,jdbcType=VARCHAR},
-      countyId = #{countyid,jdbcType=BIGINT},
-      townId = #{townid,jdbcType=BIGINT},
-      villageId = #{villageid,jdbcType=BIGINT},
-      blockId = #{blockid,jdbcType=BIGINT},
+      countyId = #{countyId,jdbcType=BIGINT},
+      townId = #{townId,jdbcType=BIGINT},
+      villageId = #{villageId,jdbcType=BIGINT},
+      blockId = #{blockId,jdbcType=BIGINT},
       villages = #{villages,jdbcType=VARCHAR},
       area = #{area,jdbcType=FLOAT},
       `header` = #{header,jdbcType=VARCHAR},
@@ -205,4 +200,14 @@
       deleted = #{deleted,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ba_divide
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteLogicById" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    update ba_divide set deleted = 1
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0