Merge remote-tracking branch 'origin/master'

李林

2023-07-20 5322edbcc5529864aaea26d78289df7a8a36fb77

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java

@@ -4,8 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

@@ -38,6 +43,9 @@
        return materialMapper.selectMaterialById(materialId);
    }

    @Autowired
    private ProductService productService;

    @Override
    public Integer addMaterialInformation(Material material) {
        return materialMapper.insert(material);
@@ -52,10 +60,18 @@
    }

    @Override
    public Integer deleteMaterialInformation(Integer materialId) {
        LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Material::getId, materialId);
        return materialMapper.delete(wrapper);
    public Integer deleteMaterialInformation(String materialId) {
        LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
        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
@@ -67,21 +83,21 @@
    }

    @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)){
    public List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId) {
            List<String> list = new ArrayList<>();
            for (Material material:materials){
        for (Integer serialNumberId:deleteSpecificationsId){
            LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(Material::getSpecificationsId, serialNumberId);
            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;
    }
}