From a9a2d0f1d8d271985869dd2b26ac29217191ab51 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 10 Dec 2024 11:51:58 +0800
Subject: [PATCH] 应急空间新增字典，查询修改
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
index e44a95d..d242983 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -7,7 +7,7 @@
select
yes.id,yes.name,yes.full_name,yes.type,yes.main_func,yes.lng,yes.lat,yes.pre_level,
yes.capacity,yes.remark,yes.firm_id,yes.image_url,ST_AsGeoJSON(yes.geom) as geom,yes.ele,
- yfi.name as firmName,
+ ifnull(yfi.name,'吉水化工园区') as firmName,
bdb.dict_value as emergencySpaceType
from yw_emergency_space yes
left join blade_dict_biz bdb on bdb.dict_key = yes.type and bdb.code = 'emergency_space_type'
@@ -24,6 +24,9 @@
</if>
<if test="emergencySpace.preLevel!=null">
and yes.pre_level = #{emergencySpace.preLevel}
+ </if>
+ <if test="emergencySpace.category!=null">
+ and yes.category = #{emergencySpace.category}
</if>
</select>
@@ -47,6 +50,8 @@
WHERE
is_deleted = 0
and type != 7
+ and type != 9
+ and type != 11
AND type IS NOT NULL
GROUP BY type
</select>
--
Gitblit v1.9.3