不合格管理：取消隔离

huminmin

11 小时以前 466ee077797f7c145fee8462f14029255618aa6a

 src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java

@@ -1,13 +1,16 @@
package com.ruoyi.quality.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
@@ -19,6 +22,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;


@@ -45,9 +49,12 @@
    @Autowired
    private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;

    @Autowired
    private QualityInspectMapper qualityInspectMapper;

    @Override
    public IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
        return qualityTestStandardMapper.qualityTestStandardListPage(page,qualityTestStandard);
        return qualityTestStandardMapper.qualityTestStandardListPage(page, qualityTestStandard);
    }

    @Override
@@ -68,8 +75,25 @@
    }

    @Override
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId,inspectType,process);
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType, process);
    }

    @Override
    public int delQualityTestStandard(List<Integer> ids) {
        //先查询该检测标准是否有被引用如果被引用就不允许删除
        List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().in(QualityInspect::getTestStandardId, ids));
        if (qualityInspects.size() > 0) {
            throw new RuntimeException("该检测标准有被引用不允许删除");
        }
        return qualityTestStandardMapper.deleteBatchIds(ids);
    }

    @Override
    public List<QualityTestStandard> getParameterItemByProcessOrCategory(Long id, Integer inspectType) {
        return baseMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
                .eq(Objects.nonNull(id),QualityTestStandard::getProcessId, id)
                .eq(QualityTestStandard::getInspectType, inspectType));
    }