From 342e1ddc1136e22952c1420f93c0baa85df552ad Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 11:01:57 +0800
Subject: [PATCH] 社区,小区,网格查询修改,报事报修,物业申请数据过滤

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
index 4c35b66..abee737 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
@@ -29,23 +29,33 @@
 
     <!--自定义分页查询-->
     <select id="selectPropertyCapitalApplyPage" resultType="org.springblade.modules.property.vo.PropertyCapitalApplyVO">
-        select * from jczz_property_capital_apply where is_deleted = 0
+        select
+        jpca.*,
+        jd.name as districtName
+        from jczz_property_capital_apply jpca
+        left join jczz_district jd on jd.id = jpca.district_id and jd.is_deleted = 0
+        where jpca.is_deleted = 0
         <if test="propertyCapitalApply.districtId!=null">
-            and district_id = #{propertyCapitalApply.districtId}
+            and jpca.district_id = #{propertyCapitalApply.districtId}
         </if>
         <if test="propertyCapitalApply.name!=null and propertyCapitalApply.name!=''">
-            and name like concat('%',#{propertyCapitalApply.name},'%')
+            and jpca.name like concat('%',#{propertyCapitalApply.name},'%')
         </if>
         <if test="propertyCapitalApply.linkman!=null and propertyCapitalApply.linkman!=''">
-            and linkman like concat('%',#{propertyCapitalApply.linkman},'%')
+            and jpca.linkman like concat('%',#{propertyCapitalApply.linkman},'%')
         </if>
-
+        <if test="propertyCapitalApply.districtName!=null and propertyCapitalApply.districtName!=''">
+            and jd.name like concat('%',#{propertyCapitalApply.districtName},'%')
+        </if>
         <if test="propertyCapitalApply.districtIdList!=null and propertyCapitalApply.districtIdList!=''">
-            and district_id in
+            and jpca.district_id in
             <foreach collection="propertyCapitalApply.districtIdList" item="item" separator ="," open="("  close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="propertyCapitalApply.regionCode != null and propertyCapitalApply.regionCode !='' ">
+            and jd.community_code like concat('%',#{propertyCapitalApply.regionCode},'%')
+        </if>
     </select>
 
 

--
Gitblit v1.9.3