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 | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 631392d..d242983 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -5,8 +5,9 @@
<!--自定义分页查询-->
<select id="selectEmergencySpacePage" resultType="org.springblade.modules.yw.vo.EmergencySpaceVO">
select
- yes.*,
- yfi.name as firmName,
+ 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,
+ 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'
@@ -21,6 +22,12 @@
<if test="emergencySpace.type!=null">
and yes.type = #{emergencySpace.type}
</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>
<!--获取应急空间统计数据-->
@@ -32,16 +39,30 @@
when type =4 then '污水提升泵站'
when type =5 then '水库'
when type =6 then '应急泵'
- when type =7 then '消防沙'
+ when type =8 then '沟渠'
+ when type =9 then '废水处理站'
+ when type =10 then '排水口'
+ when type =11 then '污水池'
end as type,
count(*) as num
FROM
yw_emergency_space
WHERE
is_deleted = 0
+ and type != 7
+ and type != 9
+ and type != 11
AND type IS NOT NULL
- AND firm_id IS NOT NULL
GROUP BY type
</select>
+ <!--获取应急池容量-->
+ <select id="getEmePool" resultType="java.lang.String">
+ SELECT
+ sum( capacity ) AS num
+ FROM
+ yw_emergency_space
+ WHERE type = 1 AND is_deleted = 0
+ </select>
+
</mapper>
--
Gitblit v1.9.3