From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index 985fc29..4d44956 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="districtResultMap" type="org.springblade.modules.district.entity.DistrictEntity">
         <result column="id" property="id"/>
-        <result column="aoi_cdoe" property="aoiCdoe"/>
+        <result column="aoi_code" property="aoiCode"/>
         <result column="community_code" property="communityCode"/>
         <result column="name" property="name"/>
         <result column="address" property="address"/>
@@ -21,13 +21,23 @@
 
     <!--自定义分页-->
     <select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
-        select * from jczz_district
-        where is_deleted = 0
+        select
+        jd.*,
+        br.village_name as communityName,br.town_name as townStreetName
+        from jczz_district jd
+        left join blade_region br on br.code = jd.community_code
+        where jd.is_deleted = 0
         <if test="district.name !=null and district.name !=''">
-            and name like concat('%',#{district.name},'%')
+            and jd.name like concat('%',#{district.name},'%')
+        </if>
+        <if test="district.communityName !=null and district.communityName !=''">
+            and br.village_name like concat('%', #{district.communityName},'%')
         </if>
         <if test="district.communityCode !=null and district.communityCode !=''">
-            and community_code = #{district.communityCode}
+            and jd.community_code = #{district.communityCode}
+        </if>
+        <if test="district.townStreetName !=null and district.townStreetName !=''">
+            and br.town_name like concat('%',#{district.townStreetName},'%')
         </if>
     </select>
 
@@ -46,8 +56,25 @@
         name
         from jczz_district
         where is_deleted = 0
+        <if test="district.districtIdList!=null and district.districtIdList!=''">
+            and id in
+            <foreach collection="district.districtIdList" item="item" separator ="," open="("  close=")">
+                #{item}
+            </foreach>
+        </if>
         )
     </select>
 
+    <!--小区自定义获取详情查询-->
+    <select id="getDetail" resultType="org.springblade.modules.district.vo.DistrictVO">
+        SELECT
+        jd.*,
+        jda.nei_code as communityCode,jda.nei_name as communityName
+        FROM jczz_district jd
+        left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
+        where jd.is_deleted = 0
+        and jda.address_code = #{district.houseCode}
+    </select>
+
 
 </mapper>

--
Gitblit v1.9.3