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/service/impl/EmergencySuppliesServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 9b57cd5..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()));
@@ -135,7 +135,6 @@
wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
.eq("is_deleted",0);
if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
- && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
&& !emergencySuppliesExcel.getSuppliesName().contains("环境局")
){
wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
--
Gitblit v1.9.3