From dd2554435b9ced61e2a6a06627145fca3bf2685b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 04 九月 2023 17:17:17 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index 0730bc4..d6a5bd6 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -2,17 +2,25 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
+import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
+import com.yuanchu.limslaboratory.pojo.dto.AddSpecifications;
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
import com.yuanchu.limslaboratory.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -29,10 +37,10 @@
private SpecificationsMapper specificationsMapper;
@Autowired
- private MaterialService materialService;
-
- @Autowired
private ProductService productService;
+
+ @Resource
+ ProductModelMapper productModelMapper;
@Override
public Integer deleteSpecifications(Integer specificationsId) {
@@ -43,21 +51,18 @@
list.add(specificationsId);
int isDeleteSuccess = specificationsMapper.update(new Specifications(), updateWrapper);
if (isDeleteSuccess == 1){
- List<String> deleteMaterialId = materialService.specificationsIdDeleteMaterial(list);
- if (!ObjectUtils.isEmpty(deleteMaterialId)){
- productService.MaterialIdDeleteProduct(deleteMaterialId);
- }
+ productService.deleteProductInformation(list);
return 1;
}
return 0;
}
@Override
- public List<Integer> SerialNumberIdDeleteSpecifications(List<String> deleteSerialNumberId) {
+ public List<Integer> StandardIdDeleteSpecifications(List<Integer> deleteStandard) {
List<Integer> list = new ArrayList<>();
- for (String serialNumberId:deleteSerialNumberId){
+ for (Integer standard : deleteStandard){
LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Specifications::getId, serialNumberId);
+ wrapper.eq(Specifications::getStandardId, standard);
wrapper.select(Specifications::getId);
List<Specifications> maps1 = specificationsMapper.selectList(wrapper);
for (Specifications specifications:maps1){
@@ -70,4 +75,28 @@
}
return list;
}
+
+ @Override
+ public Integer addSpecificationsInformation(AddSpecifications addStandardDto) {
+ Specifications specifications = new Specifications()
+ .setName(addStandardDto.getSpecificationsName())
+ .setStandardId(addStandardDto.getStandardId());
+ specificationsMapper.insert(specifications);
+ //娣诲姞鍨嬪彿涔嬪悗娣诲姞椤圭洰
+ List<Map<String, Object>> productModel=productModelMapper.seleMode(specificationsMapper.selMateName(addStandardDto.getStandardId()));
+ List<Product> productList = productModel.stream().map(stringObjectMap -> {
+ Product product = new Product();
+ product.setName(stringObjectMap.get("name").toString());
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
+ product.setFather(stringObjectMap.get("father").toString());
+ }
+ if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
+ product.setUnit(stringObjectMap.get("unit").toString());
+ }
+ product.setSpecifications_id(specifications.getId());
+ return product;
+ }).collect(Collectors.toList());
+ productService.saveBatch(productList);
+ return 1;
+ }
}
--
Gitblit v1.9.3