From 7b0046c605e3accdcf8fb5987e8690b29927c41b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 04 Jan 2025 11:24:58 +0800
Subject: [PATCH] 导入相关调整
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
index 6c12a32..9b57cd5 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -76,16 +76,16 @@
setFirm(emergencySuppliesExcel,emergencySuppliesEntity);
setSupplies(emergencySuppliesExcel,emergencySuppliesEntity);
// 查询是否已入库
- Long id = isSave(emergencySuppliesEntity);
+// Long id = isSave(emergencySuppliesEntity);
// 已入库
- if (null!=id){
- if (isCovered){
- emergencySuppliesEntity.setId(id);
- // 覆盖-更新
- updateById(emergencySuppliesEntity);
- continue;
- }
- }
+// if (null!=id){
+// if (isCovered){
+// emergencySuppliesEntity.setId(id);
+// 覆盖-更新
+// updateById(emergencySuppliesEntity);
+// continue;
+// }
+// }
// 保存
save(emergencySuppliesEntity);
}
@@ -134,7 +134,10 @@
QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
.eq("is_deleted",0);
- if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
+ if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
+ && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
+ && !emergencySuppliesExcel.getSuppliesName().contains("环境局")
+ ){
wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
}
SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
--
Gitblit v1.9.3