From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 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 dcc8b99..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,15 +29,32 @@
 
     <!--自定义分页查询-->
     <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 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