Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-26 30f6da8bf0143906b42fa600f6a604cea6c81f71

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

@@ -4,15 +4,11 @@
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;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -33,11 +29,13 @@
    @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);
@@ -45,19 +43,6 @@

    @Autowired
    private ProductService productService;

    @Override
    public Integer addMaterialInformation(Material material) {
        return materialMapper.insert(material);
    }

    @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(String materialId) {
@@ -75,19 +60,10 @@
    }

    @Override
    public Integer updateMaterialInformation(Material material) {
        LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(Material::getId, material.getId());
        materialMapper.updateById(material);
        return materialMapper.update(material, updateWrapper);
    }

    @Override
    public List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId) {
        List<String> list = new ArrayList<>();
        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){