Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

5 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

@@ -1,12 +1,18 @@
package com.ruoyi.quality.service.impl;

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.quality.dto.QualityTestStandardDto;
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;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,22 +44,48 @@
    @Autowired
    private QualityTestStandardParamService qualityTestStandardParamService;

    @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
    public int copyParam(QualityTestStandardDto qualityTestStandardDto) {
    public int copyParam(QualityTestStandard qualityTestStandard) {
        //先查询被复制的检测标准的详情参数
        List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandardDto.getOldTestStandardId()));
        List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.getId()));
        QualityTestStandard testStandard = qualityTestStandardMapper.selectById(qualityTestStandard.getId());
        testStandard.setId(null);
        testStandard.setStandardNo(null);
        qualityTestStandardMapper.insert(testStandard);
        List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> {
            oldQualityTestStandardParam.setTestStandardId(qualityTestStandardDto.getNewTestStandardId());
            oldQualityTestStandardParam.setTestStandardId(testStandard.getId());
            oldQualityTestStandardParam.setId(null);
            return oldQualityTestStandardParam;
        }).collect(Collectors.toList());
        qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);
        return 0;
    }

    @Override
    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);
    }


}