From 06df33f156924c564c17b11fdb96c5bb298a810d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 07 Aug 2024 11:28:29 +0800
Subject: [PATCH] 三色任务和自查任务

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index e1f65f4..9cfa956 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -1152,7 +1152,9 @@
         jp.universal_account
         from
         jczz_place jp
-        LEFT JOIN jczz_place_poi_label jppl ON jppl.place_id = jp.id
+        LEFT JOIN jczz_place_poi_label jppl ON jppl.place_id = jp.id and jppl.type = 3
+        LEFT JOIN jczz_grid jg on jg.id = jp.grid_id
+        LEFT JOIN blade_region br on br.code = jg.community_code
         <where>
             <if test="place.id != null "> and id = #{place.id}</if>
             <if test="place.houseCode != null  and place.houseCode != ''"> and house_code = #{place.houseCode}</if>
@@ -1188,7 +1190,9 @@
             <if test="place.noExplosionCategory != null "> and no_explosion_category = #{place.noExplosionCategory}</if>
             <if test="place.principalAccount != null "> and principal_account = #{place.principalAccount}</if>
             <if test="place.universalAccount != null "> and universal_account = #{place.universalAccount}</if>
-            <if test="place.poiCodes != null "> and jppl.poi_code = #{place.poiCodes}</if>
+            <if test="place.placeSmallLabel != null "> and jppl.poi_code = #{place.placeSmallLabel}</if>
+            <if test="place.color != null "> and jppl.color = #{place.color}</if>
+            <if test="place.taskRange != null "> and br.code like concat(#{place.taskRange},'%') </if>
         </where>
     </select>
 

--
Gitblit v1.9.3