From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 二月 2025 11:22:50 +0800
Subject: [PATCH] 设备模块修改bug
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 33d723d..4744894 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -20,7 +20,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,9 +70,6 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void importPartExcel(List<StructureTestObjectData> list) {
- List<StructureTestObject> addList = new ArrayList<>();
- List<StructureTestObject> updateList = new ArrayList<>();
- List<Product> addProductList = new ArrayList<>();
list.forEach(i -> {
// 妫�楠屽璞�
StructureTestObject structureTestObject1 = structureTestObjectMapper.selectOne(Wrappers.<StructureTestObject>lambdaQuery()
@@ -91,34 +87,40 @@
structureTestObject.setSpecimenName(i.getSpecimenName());
structureTestObject.setSpecimenNameEn(i.getSpecimenNameEn());
structureTestObject.setCode(i.getCode());
- addList.add(structureTestObject);
+ structureTestObjectMapper.insert(structureTestObject);
+
+ // 浜у搧
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+ .eq(Product::getName, i.getName())
+ .eq(Product::getNameEn, i.getNameEn()));
+ if (ObjectUtils.isEmpty(product)){
+ Product product1 = new Product();
+ product1.setName(i.getName());
+ product1.setNameEn(i.getNameEn());
+ product1.setObjectId(structureTestObject.getId());
+ baseMapper.insert(product1);
+ }
} else {
structureTestObject1.setCode(i.getCode());
structureTestObject1.setLaboratoryId(laboratory.getId());
- updateList.add(structureTestObject1);
+ structureTestObjectMapper.updateById(structureTestObject1);
+ // 浜у搧
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
+ .eq(Product::getName, i.getName())
+ .eq(Product::getNameEn, i.getNameEn()));
+ if (ObjectUtils.isEmpty(product)){
+ Product product1 = new Product();
+ product1.setName(i.getName());
+ product1.setNameEn(i.getNameEn());
+ product1.setObjectId(structureTestObject1.getId());
+ baseMapper.insert(product1);
+ } else {
+ product.setName(i.getName());
+ product.setNameEn(i.getNameEn());
+ product.setObjectId(structureTestObject1.getId());
+ baseMapper.updateById(product);
+ }
}
-
- // 浜у搧
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
- .eq(Product::getName, i.getName())
- .eq(Product::getNameEn, i.getNameEn()));
- if (ObjectUtils.isEmpty(product)){
- Product product1 = new Product();
- product1.setName(i.getName());
- product1.setNameEn(i.getNameEn());
- addProductList.add(product1);
- }
- });
- addList.forEach(i -> {
- structureTestObjectMapper.insert(i);
- });
- saveBatch(addProductList);
- updateList.forEach(i -> {
- structureTestObjectMapper.updateById(i);
});
}
}
-
-
-
-
--
Gitblit v1.9.3