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 | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 a08eb0e..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
@@ -1,28 +1,21 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
-import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
-import com.yuanchu.limslaboratory.pojo.ProductModel;
+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.beans.factory.annotation.Autowired;
-import com.yuanchu.limslaboratory.service.UserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
+
/**
* <p>
@@ -38,9 +31,6 @@
@Resource
private ProductMapper productMapper;
- @Resource
- ProductModelMapper productModelMapper;
-
@Override
public void deleteProductInformation(List<Integer> SpecificationsId) {
@@ -52,11 +42,17 @@
}
}
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
+ @Override
+ public List<Integer> chooseVersion(Integer specificationsId) {
+ return productMapper.chooseVersion(specificationsId);
+ }
+
//灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
@Override
@Transactional(rollbackFor = Exception.class)
- public List<Map<String, Object>> pageProductInformation(Integer specificationsId) {
- return productMapper.pageProductInformation(specificationsId);
+ public List<Map<String, Object>> pageProductInformation(Integer specificationsId, Integer version) {
+ return productMapper.pageProductInformation(specificationsId, version);
}
//濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
@@ -75,5 +71,36 @@
productMapper.deleteList(ids);
}
+ //娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
+ @Override
+ 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(productMapper.chooseVersion(specificationsId).get(0) + 1);
+ product.setSpecifications_id(specificationsId);
+ }
+ saveBatch(productList);
+ return productList.get(0).getVersion();
+ }
+
+ //鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ @Override
+ 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