From db321b2c533fef1d5ddba16b3908693cd984cfb9 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Nov 2024 16:43:01 +0800
Subject: [PATCH] 添加一个过滤全景的条件

---
 src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 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 ddab7b4..0a9a6d9 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.modules.yw.mapper.EmergencySpaceMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="emergencySpaceResultMap" type="org.springblade.modules.yw.entity.EmergencySpaceEntity">
-        <result column="id" property="id"/>
-        <result column="name" property="name"/>
-        <result column="type" property="type"/>
-        <result column="main_func" property="mainFunc"/>
-        <result column="lng" property="lng"/>
-        <result column="lat" property="lat"/>
-        <result column="pre_level" property="preLevel"/>
-        <result column="capacity" property="capacity"/>
-        <result column="remark" property="remark"/>
-        <result column="firm_id" property="firmId"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="is_deleted" property="isDeleted"/>
-    </resultMap>
-
     <!--自定义分页查询-->
-    <select id="selectEmergencySpacePage" resultMap="emergencySpaceResultMap">
-        select * from yw_emergency_space where is_deleted = 0
+    <select id="selectEmergencySpacePage" resultType="org.springblade.modules.yw.vo.EmergencySpaceVO">
+        select
+        yes.*,
+        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'
+        left join yw_firm_info yfi on yfi.id = yes.firm_id and yfi.is_deleted = 0
+        where yes.is_deleted = 0
+        <if test="emergencySpace.name!=null and emergencySpace.name!=''">
+            and yes.name like concat('%',#{emergencySpace.name},'%')
+        </if>
+        <if test="emergencySpace.firmId!=null">
+            and yes.firm_id = #{emergencySpace.firmId}
+        </if>
+        <if test="emergencySpace.type!=null">
+            and yes.type = #{emergencySpace.type}
+        </if>
+        <if test="emergencySpace.preLevel!=null">
+            and yes.pre_level = #{emergencySpace.preLevel}
+        </if>
     </select>
 
     <!--获取应急空间统计数据-->
@@ -43,8 +43,16 @@
         WHERE
             is_deleted = 0
             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