From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 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..d3d19f3 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>
@@ -270,6 +272,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 +287,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