From d93c3e0310ad88dbe4d09dcfe0e497356d27f40e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 20 Feb 2025 17:39:54 +0800
Subject: [PATCH] 部分查询，导入操作调整
---
src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 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 bd40292..6612382 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/EmergencySuppliesMapper.xml
@@ -26,13 +26,12 @@
yfi.name as firmName,
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,
+ yes.type as emeSupType,
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
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'
where yes.is_deleted = 0
<if test="emergencySupplies.name!=null and emergencySupplies.name!=''">
@@ -61,14 +60,13 @@
yfi.name as firmName,
ys.per_in_cha as personInCha,ys.per_in_cha_pho as personInChaPhone,ys.address supAdd,
ifnull(ys.lng,yp.lng) as lng,ifnull(ys.lat,yp.lat) as lat,
- bdb.dict_value as emeSupType,
+ yes.type as emeSupType,
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
--
Gitblit v1.9.3