From b1e8a099eb3117bcbd5f2e0c9a2eb0accabd8cbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 11 Feb 2025 08:56:46 +0800
Subject: [PATCH] 通过风险源点位分析三级防控点查询修改
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
index 4871895..bd40292 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
@@ -27,7 +27,7 @@
ys.per_in_cha as personInCha,ys.per_in_cha_pho as personInChaPhone,ys.address supAdd,
ys.lng,ys.lat,
bdb.dict_value as emeSupType,
- concat(yes.num,bdb1.dict_value) as numUnit
+ concat(yes.num,ifnull(bdb1.dict_value,'')) as numUnit
from
yw_emergency_supplies yes
left join yw_supplies ys on ys.id = yes.supplies_id and ys.is_deleted = 0
@@ -60,15 +60,17 @@
yes.*,
yfi.name as firmName,
ys.per_in_cha as personInCha,ys.per_in_cha_pho as personInChaPhone,ys.address supAdd,
- ys.lng,ys.lat,
+ ifnull(ys.lng,yp.lng) as lng,ifnull(ys.lat,yp.lat) as lat,
bdb.dict_value as emeSupType,
- concat(yes.num,bdb1.dict_value) as numUnit
+ concat(yes.num,ifnull(bdb1.dict_value,'')) as numUnit,
+ yp.url as panoramicUrl
from
yw_emergency_supplies yes
left join yw_supplies ys on ys.id = yes.supplies_id and ys.is_deleted = 0
left join yw_firm_info yfi on yfi.id = yes.firm_id and yfi.is_deleted = 0
left join blade_dict_biz bdb on bdb.dict_key = yes.type and bdb.code = 'eme_sup_type'
left join blade_dict_biz bdb1 on bdb1.dict_key = yes.unit and bdb1.code = 'unit'
+ left join yw_panoramic yp on yp.firm_id = yes.firm_id and yp.is_deleted = 0
where yes.is_deleted = 0
and yes.firm_id = #{emergencySupplies.firmId}
</select>
--
Gitblit v1.9.3