From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 3d20a4c..11ff370 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,6 +1,7 @@
package com.yuanchu.limslaboratory.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.service.ProductService;
@@ -43,7 +44,7 @@
}
@Override
- public List<Map<String, Object>> getListProductInformation(Integer materialId) {
+ 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);
@@ -77,23 +78,26 @@
@Override
public Integer deleteProductInformation(Integer productId) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
+ LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getId, productId);
- return productMapper.delete(wrapper);
+ wrapper.set(Product::getState, 0);
+ return productMapper.update(new Product(), wrapper);
}
@Override
- public void deleteProductEqMaterialId(List<String> materialListId) {
- for (String materialId : materialListId){
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
+ public void MaterialIdDeleteProduct(List<String> deleteMaterialId) {
+ for (String materialId : deleteMaterialId){
+ LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getMaterialId, materialId);
- wrapper.select(Product::getId);
- List<Product> products = productMapper.selectList(wrapper);
- List<Integer> productDeleteId = new ArrayList<>();
- for (Product product : products){
- productDeleteId.add(product.getId());
- }
- productMapper.deleteBatchIds(productDeleteId);
+ 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