From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 55 +------------------------------------------------------
1 files changed, 1 insertions(+), 54 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 11ff370..45dee2f 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
@@ -31,52 +31,6 @@
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);
@@ -88,16 +42,9 @@
public void MaterialIdDeleteProduct(List<String> deleteMaterialId) {
for (String materialId : deleteMaterialId){
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
- wrapper.eq(Product::getMaterialId, materialId);
+ wrapper.eq(Product::getId, 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);
}
}
--
Gitblit v1.9.3