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/MaterialServiceImpl.java | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 56a9a88..a373c2a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -6,8 +6,9 @@
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.service.ProductService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -28,60 +29,51 @@
@Resource
MaterialMapper materialMapper;
+ //鏌ヨ鐗╂枡淇℃伅
@Override
public List<Material> selectMaterialLimit(int pageSize, int countSize) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
}
+ //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
@Override
public Map selectMaterialById(String materialId) {
return materialMapper.selectMaterialById(materialId);
}
- @Override
- public Integer addMaterialInformation(Material material) {
- return materialMapper.insert(material);
- }
+ @Autowired
+ private ProductService productService;
@Override
- public List<Map<String, Object>> getListMaterialInformation(String specificationsId) {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getSpecificationsId, specificationsId);
- wrapper.select(Material::getId, Material::getName);
- return materialMapper.selectMaps(wrapper);
- }
-
- @Override
- public Integer deleteMaterialInformation(Integer materialId) {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getId, materialId);
- return materialMapper.delete(wrapper);
- }
-
- @Override
- public Integer updateMaterialInformation(Material material) {
+ public Integer deleteMaterialInformation(String materialId) {
LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Material::getId, material.getId());
- materialMapper.updateById(material);
- return materialMapper.update(material, updateWrapper);
+ updateWrapper.eq(Material::getId, materialId);
+ updateWrapper.set(Material::getState, 0);
+ List<String> list = new ArrayList<>();
+ list.add(materialId);
+ int isDeleteSuccess = materialMapper.update(new Material(), updateWrapper);
+ if (isDeleteSuccess == 1){
+ productService.MaterialIdDeleteProduct(list);
+ return 1;
+ }
+ return 0;
}
@Override
- public List<String> deleteMaterialEqSpecification(String specificationsId) {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getSpecificationsId, specificationsId);
- wrapper.select(Material::getId);
- List<Material> materials = materialMapper.selectList(wrapper);
- if (!ObjectUtils.isEmpty(materials)){
- List<String> list = new ArrayList<>();
- for (Material material:materials){
+ public List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId) {
+ List<String> list = new ArrayList<>();
+ for (Integer serialNumberId:deleteSpecificationsId){
+ LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Material::getId);
+ List<Material> maps1 = materialMapper.selectList(wrapper);
+ for (Material material:maps1){
+ LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Material::getId, material.getId());
+ updateWrapper.set(Material::getState, 0);
+ materialMapper.update(new Material(), updateWrapper);
list.add(material.getId());
}
- int isDeleteList = materialMapper.deleteBatchIds(list);
- if (isDeleteList != 0) {
- return list;
- }
}
- return null;
+ return list;
}
}
--
Gitblit v1.9.3