From 08609f7412d2ed23aa1e47afa604b44ac812277a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 02 Dec 2024 21:30:45 +0800
Subject: [PATCH] 物资查询修改(新增全景url返回)

---
 src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 5a133e1..bd40292 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
@@ -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,ifnull(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