From d276b2f67315e638b6596b48da1b6f9ac01dd69b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 27 一月 2024 08:58:28 +0800
Subject: [PATCH] 	修改取水口查询ID类型

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
index d9b4ac4..00f1458 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -227,8 +227,9 @@
       lat = #{lat,jdbcType=DOUBLE},
       remarks = #{remarks,jdbcType=VARCHAR},
       `operator` = #{operator,jdbcType=BIGINT},
-      operateDt = #{operatedt,jdbcType=TIMESTAMP},
-      deleted = #{deleted,jdbcType=TINYINT}
+      operateDt = #{operatedt,jdbcType=TIMESTAMP}
+<!--    ,-->
+<!--      deleted = #{deleted,jdbcType=TINYINT}-->
     where id = #{id,jdbcType=BIGINT}
   </update>
 
@@ -243,6 +244,7 @@
         INNER JOIN ba_district village ON divi.villageid = village.id
         , (SELECT @i:=0) AS itable
     <where>
+      AND divi. deleted = 0
       <if test = "divideName != null and divideName !=''">
         AND divi.name LIKE CONCAT('%',#{divideName},'%')
       </if>
@@ -257,6 +259,7 @@
   <select id="getDivides" resultType="com.dy.pipIrrGlobal.voPr.VoDivide">
     SELECT
       (@i:=@i+1) AS id,
+      CAST(divi.id AS char) AS divideId,
       divi.name AS divideName,
       blo.`name` AS blockName,
       divi.header,
@@ -270,6 +273,7 @@
         INNER JOIN ba_district village ON divi.villageid = village.id
         , (SELECT @i:=0) AS itable
     <where>
+      AND divi. deleted = 0
       <if test = "divideName != null and divideName !=''">
         AND divi.name LIKE CONCAT('%',#{divideName},'%')
       </if>
@@ -284,4 +288,19 @@
     </if>
   </select>
 
+  <!--鏍规嵁鍒嗘按鎴縄D閫昏緫鍒犻櫎鍒嗘按鎴�-->
+  <update id="deleteDivideById" parameterType="java.lang.Long">
+    update pr_divide set deleted = 1
+    <where>
+      <if test = "id != null and id > 0">
+        AND id = ${id}
+      </if>
+    </where>
+  </update>
+
+  <!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�-->
+  <select id="getBlockIdById" resultType="java.lang.Long">
+    SELECT blockId FROM pr_divide WHERE id = ${divideId}
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0