From 15a3aba3a971501e55400a546560280e46b758ca Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 31 Oct 2024 15:40:34 +0800
Subject: [PATCH] 应急空间，救援队伍，风险源，应急物资查询调整，按企业查询
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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..631392d 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,25 @@
<!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>
</select>
<!--获取应急空间统计数据-->
--
Gitblit v1.9.3