From 7728d8f1900a984dde8721f1f06e00eecc5a67de Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 21 Feb 2025 09:18:13 +0800
Subject: [PATCH] 修改配置
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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..70c4b61 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
@@ -65,9 +65,9 @@
for (EmergencySuppliesExcel emergencySuppliesExcel : data) {
EmergencySuppliesEntity emergencySuppliesEntity = Objects.requireNonNull(BeanUtil.copy(emergencySuppliesExcel, EmergencySuppliesEntity.class));
// 物资类型转换
- if (!Strings.isBlank(emergencySuppliesExcel.getType())){
- emergencySuppliesEntity.setType(Integer.parseInt(emergencySuppliesExcel.getType()));
- }
+// if (!Strings.isBlank(emergencySuppliesExcel.getType())){
+// emergencySuppliesEntity.setType(Integer.parseInt(emergencySuppliesExcel.getType()));
+// }
// 物资单位转换
if (!Strings.isBlank(emergencySuppliesExcel.getUnit())){
emergencySuppliesEntity.setUnit(Integer.parseInt(emergencySuppliesExcel.getUnit()));
@@ -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,9 @@
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("环境局")
+ ){
wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
}
SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
--
Gitblit v1.9.3