From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 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 c27c343..eed66aa 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,18 @@
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.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.List;
import java.util.Map;
-import java.util.Objects;
+
/**
* <p>
@@ -38,13 +28,10 @@
@Resource
private ProductMapper productMapper;
- @Resource
- ProductModelMapper productModelMapper;
-
@Override
public void deleteProductInformation(List<Integer> SpecificationsId) {
- for (Integer materialId : SpecificationsId){
+ for (Integer materialId : SpecificationsId) {
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getSpecifications_id, materialId);
wrapper.set(Product::getState, 0);
@@ -52,11 +39,50 @@
}
}
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
+ @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);
+ }
+
+ //濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ @Override
+ public Integer write(Integer id, String required, String internal) {
+ Product product = new Product();
+ product.setId(id);
+ product.setRequired(required);
+ product.setInternal(internal);
+ MyUtil.PrintLog(product.toString());
+ return productMapper.updateById(product);
+ }
+
+ @Override
+ public void deleteList(String ids) {
+ productMapper.deleteList(ids);
+ }
+
+ //娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
+ @Override
+ public Integer addVersion(Integer specificationsId) {
+ List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
+ for (Product product : productList) {
+ product.setVersion(product.getVersion()+1);
+ }
+ saveBatch(productList);
+ return productList.get(0).getVersion();
+ }
+
+ //鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ @Override
+ public List<Map<String,Object>> chooseProject(Integer modelId) {
+ return productMapper.chooseProject(modelId);
}
--
Gitblit v1.9.3