From 8abe275e36823f1065300af45e1f7a9a68f549a7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 16:14:40 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index eed66aa..32a0349 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.pojo.dto.StandardProductAddDto;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -48,8 +51,8 @@
//灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
@Override
@Transactional(rollbackFor = Exception.class)
- public List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version) {
- return productMapper.pageProductInformation(specificationsId,version);
+ public List<Map<String, Object>> pageProductInformation(Integer specificationsId, Integer version) {
+ return productMapper.pageProductInformation(specificationsId, version);
}
//濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
@@ -70,20 +73,34 @@
//娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
@Override
- public Integer addVersion(Integer specificationsId) {
- List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
+ public Integer addVersion(Integer specificationsId, Integer version) {
+ List<Product> productList = productMapper.selectList(Wrappers.<Product>query()
+ .eq("specifications_id", specificationsId)
+ .eq("version", version));
for (Product product : productList) {
- product.setVersion(product.getVersion()+1);
+ product.setId(null);
+ product.setVersion(productMapper.chooseVersion(specificationsId).get(0) + 1);
+ product.setSpecifications_id(specificationsId);
}
- saveBatch(productList);
+ saveBatch(productList);
return productList.get(0).getVersion();
}
//鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
@Override
- public List<Map<String,Object>> chooseProject(Integer modelId) {
+ public List<Map<String, Object>> chooseProject(Integer modelId) {
return productMapper.chooseProject(modelId);
}
+ @Override
+ public String addProduct(StandardProductAddDto dto) {
+ int i = productMapper.addProduct(new Product(
+ dto.getName(), dto.getFather(),
+ dto.getUnit(), new Date(), new Date(),
+ Integer.parseInt(dto.getVersion()), dto.getSpecificationId()));
+ if(i>0) return "娣诲姞鎴愬姛锛�";
+ return "娣诲姞澶辫触";
+ }
+
}
--
Gitblit v1.9.3