From f1d445b9d51abb020cbcd4a61b4edd36fbe75216 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:57:38 +0800
Subject: [PATCH] 新增检验修改
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 120 +++++++++++++++++++++++++----------------------------------
1 files changed, 51 insertions(+), 69 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 93d4b27..fec45c1 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,20 +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.toolkit.Wrappers;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yuanchu.limslaboratory.service.UserService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
/**
* <p>
@@ -30,80 +28,64 @@
@Resource
private ProductMapper productMapper;
- @Override
- public List<Product> selectProductByMaterialId(String materialId) {
- return productMapper.selectProductByMaterialId(materialId);
- }
-
- @Autowired
- private UserService userService;
@Override
- public Integer addProductInformation(Product product) {
- return productMapper.insert(product);
- }
-
- @Override
- public List<Map<String, Object>> getListProductInformation(String materialId) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getMaterialId, materialId);
- wrapper.select(Product::getId, Product::getName, Product::getFather);
- wrapper.groupBy(Product::getFather);
- List<Map<String, Object>> products = productMapper.selectMaps(wrapper);
- for (Map<String, Object> product : products) {
- if (!ObjectUtils.isEmpty(product.get("father"))) {
- product.remove("name");
- product.remove("id");
- LambdaQueryWrapper<Product> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(Product::getFather, product.get("father"));
- wrapper1.select(Product::getId, Product::getName);
- List<Map<String, Object>> maps = productMapper.selectMaps(wrapper1);
- product.put("sonProduct", maps);
- }
- }
- for (Map<String, Object> product : products) {
- System.out.println(product);
- }
- return products;
- }
-
- @Override
- public Map<String, Object> getProductInformation(Integer productId) {
- Map<String, Object> productMap = productMapper.getProductInformation(productId);
- String userName = userService.selectByUserId((Integer) productMap.get("user_id"));
- productMap.remove("user_id");
- productMap.put("userName", userName);
- return productMap;
- }
-
- @Override
- public Integer deleteProductInformation(Integer productId) {
- LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
- wrapper.eq(Product::getId, productId);
- wrapper.set(Product::getState, 0);
- return productMapper.update(new Product(), wrapper);
- }
-
- @Override
- public void MaterialIdDeleteProduct(List<String> deleteMaterialId) {
- for (String materialId : deleteMaterialId) {
+ public void deleteProductInformation(List<Integer> SpecificationsId) {
+ for (Integer materialId : SpecificationsId) {
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
- wrapper.eq(Product::getMaterialId, materialId);
+ wrapper.eq(Product::getSpecifications_id, materialId);
wrapper.set(Product::getState, 0);
productMapper.update(new Product(), wrapper);
}
}
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
@Override
- public Integer updateMaterialInformation(Product product) {
- LambdaUpdateWrapper<Product> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Product::getId, product.getId());
- return productMapper.update(product, updateWrapper);
+ public List<Integer> chooseVersion(Integer specificationsId) {
+ return productMapper.chooseVersion(specificationsId);
}
- //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
@Override
- public List<Map> selectInstrumentByProname(String name) {
- return productMapper.selectInstrumentByProname(name);
+ @Transactional(rollbackFor = Exception.class)
+ 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.setId(null);
+ product.setVersion(product.getVersion()+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);
+ }
+
+
}
--
Gitblit v1.9.3