From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 3fb178a..7308703 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -5,7 +5,8 @@
<!--自定义分页查询-->
<select id="selectEmergencySpacePage" resultType="org.springblade.modules.yw.vo.EmergencySpaceVO">
select
- yes.*,
+ 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,
yfi.name as firmName,
bdb.dict_value as emergencySpaceType
from yw_emergency_space yes
@@ -21,6 +22,9 @@
<if test="emergencySpace.type!=null">
and yes.type = #{emergencySpace.type}
</if>
+ <if test="emergencySpace.preLevel!=null">
+ and yes.pre_level = #{emergencySpace.preLevel}
+ </if>
</select>
<!--获取应急空间统计数据-->
@@ -33,6 +37,7 @@
when type =5 then '水库'
when type =6 then '应急泵'
when type =7 then '消防沙'
+ when type =8 then '沟渠'
end as type,
count(*) as num
FROM
--
Gitblit v1.9.3