From 32ddd9d13c53dd7fe5a09120ca59b29e61afc0cc Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 16:24:08 +0800
Subject: [PATCH] 标准库中新增区间后，保存提示报错修改
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 98 +++++++++++--------------------------------------
1 files changed, 22 insertions(+), 76 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index ba585df..918a98b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -4,34 +4,25 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.basic.dto.StructureTestObjectDto;
+import com.ruoyi.basic.mapper.*;
+import com.ruoyi.basic.service.*;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.mapper.ProductMapper;
-import com.ruoyi.basic.mapper.ProductPartMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.mapper.StructureTestObjectMapper;
import com.ruoyi.basic.pojo.*;
-import com.ruoyi.basic.service.LaboratoryService;
-import com.ruoyi.basic.service.ProductService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-
/**
-* @author z1292
-* @description 閽堝琛ㄣ�恜roduct(浜у搧琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-04-26 01:11:02
-*/
+ * @author z1292
+ * @description 閽堝琛ㄣ�恜roduct(浜у搧琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-04-26 01:11:02
+ */
@Service
@AllArgsConstructor
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product>
@@ -39,17 +30,21 @@
private ProductMapper productMapper;
- private LaboratoryService laboratoryService;
-
private StructureTestObjectMapper structureTestObjectMapper;
private ProductPartMapper productPartMapper;
+
private StandardProductListService standardProductListService;
+
private StandardTreeMapper standardTreeMapper;
+
private StructureItemParameterService structureItemParameterService;
+
+
+ private WorkShopMapper workShopMapper;
@Override
public IPage<Product> selectProductListByObjectId(Page page, ProductDTO1 product) {
@@ -129,68 +124,19 @@
return productMapper.deleteById(id);
}
- @Transactional(rollbackFor = Exception.class)
@Override
- public void importPartExcel(List<StructureTestObjectData> list) {
- list.forEach(i -> {
- // 妫�楠屽璞�
- StructureTestObject structureTestObject1 = structureTestObjectMapper.selectOne(Wrappers.<StructureTestObject>lambdaQuery()
- .eq(StructureTestObject::getSpecimenName, i.getSpecimenName())
- .eq(StructureTestObject::getSpecimenNameEn, i.getSpecimenNameEn()));
- Laboratory laboratory = laboratoryService.getOne(Wrappers.<Laboratory>lambdaQuery()
- .eq(Laboratory::getLaboratoryName, i.getLaboratory()));
- if (ObjectUtils.isEmpty(laboratory)) {
- throw new BaseException("鏈壘鍒拌鍦烘墍锛�" + i.getLaboratory() + "锛岃妫�鏌ユ槸鍚﹀瓨鍦ㄨ鍦烘墍锛�");
- }
- // 濡傛灉涓虹┖杩涜鏂板
- if(ObjectUtils.isEmpty(structureTestObject1)) {
- StructureTestObject structureTestObject = new StructureTestObject();
- structureTestObject.setLaboratoryId(laboratory.getId());
- structureTestObject.setSpecimenName(i.getSpecimenName());
- structureTestObject.setSpecimenNameEn(i.getSpecimenNameEn());
- structureTestObject.setCode(i.getCode());
- 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());
- 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);
- }
- }
- });
- }
-
- @Override
- public int updateWorkShop(Integer productId, Integer workShopId,String name) {
+ public int updateWorkShop(Integer productId, Integer workShopId, String name) {
return productMapper.update(null, Wrappers.<Product>lambdaUpdate()
.set(Product::getWorkShopId, workShopId)
.set(Product::getWorkShopName, name)
.eq(Product::getId, productId));
}
+
+ @Override
+ public int updateObjectWorkShop(StructureTestObjectDto structureTestObjectDto) {
+ return structureTestObjectMapper.update(null, Wrappers.<StructureTestObject>lambdaUpdate()
+ .set(StructureTestObject::getWorkShopId, structureTestObjectDto.getWorkShopId())
+ .set(StructureTestObject::getWorkShopName, structureTestObjectDto.getWorkShopName())
+ .eq(StructureTestObject::getId, structureTestObjectDto.getId()));
+ }
}
--
Gitblit v1.9.3