From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 db51681..c011351 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -30,7 +30,7 @@
select
<include refid="Base_Column_List" />
from ba_district
- where level = #{level,jdbcType=TINYINT}
+ where deleted != 1 and level = #{level,jdbcType=TINYINT}
</select>
<select id="selectBySupperId" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -38,10 +38,10 @@
select
<include refid="Base_Column_List" />
from ba_district
- where supperId = #{supperId,jdbcType=BIGINT}
+ where deleted != 1 and supperId = #{supperId,jdbcType=BIGINT}
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
<!--@mbg.generated-->
insert into ba_district (id, supperId, `name`, num, `level`, deleted)
values (#{id,jdbcType=BIGINT},
@@ -139,4 +139,46 @@
update ba_district set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
+
+ <!--鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�-->
+ <select id="getDistrictsByVillageId" resultType="java.util.Map">
+ SELECT
+ pro.id AS provinceId,
+ pro.num AS provinceNum,
+ pro.name AS provinceName,
+ cit.id AS cityId,
+ cit.num AS cityNum,
+ cit.name AS cityName,
+ con.id AS countryId,
+ con.num AS countyNum,
+ con.name AS countryName,
+ tow.id AS townId,
+ tow.num AS townNum,
+ tow.name AS townName,
+ vil.id AS villageId,
+ vil.num AS villageNum,
+ vil.name AS villageName
+ FROM ba_district vil
+ INNER JOIN ba_district tow ON vil.supperId = tow.id
+ INNER JOIN ba_district con ON tow.supperId = con.id
+ INNER JOIN ba_district cit ON con.supperId = cit.id
+ INNER JOIN ba_district pro ON cit.supperId = pro.id
+ WHERE vil.id = ${villageId}
+ </select>
+
+ <!--鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictgsByLevel" resultType="java.util.Map">
+ SELECT
+ CAST(id AS char) AS id,
+ name
+ FROM ba_district WHERE `level` = ${level}
+ </select>
+
+ <!--鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictsBySupperId" resultType="java.util.Map">
+ SELECT
+ CAST(id AS char) AS id,
+ name
+ FROM ba_district WHERE supperId = ${supperId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0