From a92b6f6175b1401071e5fb3bd9fab8a2a3b72011 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 九月 2023 14:34:28 +0800
Subject: [PATCH] version
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 2 +-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 9 +++++----
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 17 ++++++++++-------
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 81594ba..dc1f491 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -77,12 +77,13 @@
@ApiOperation("娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/addVersion")
@AuthHandler
- public Result<?> addVersion(Integer specificationsId ) {
- Integer version = productService.addVersion(specificationsId);
- return Result.success("娣诲姞鐗堟湰"+version+"鎴愬姛");
+ public Result<?> addVersion(Integer specificationsId,Integer version ) {
+ Integer version1 = productService.addVersion(specificationsId,version);
+ return Result.success("娣诲姞鐗堟湰"+version1+"鎴愬姛");
}
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index a81e74a..076fdb1 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -49,7 +49,7 @@
* @param specificationsId
* @return
*/
- Integer addVersion(Integer specificationsId);
+ Integer addVersion(Integer specificationsId,Integer version);
/**
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 fec45c1..3a8d19f 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
@@ -9,6 +9,7 @@
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -48,8 +49,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 +71,22 @@
//娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
@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.setId(null);
- product.setVersion(product.getVersion()+1);
+ 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);
}
--
Gitblit v1.9.3