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

liyong

昨天 a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93

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

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java

@@ -34,7 +34,7 @@
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
        return AjaxResult.success(qualityTestStandardBindingService.saveBatch(qualityTestStandardBindings));
        return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
    }

    /**

 src/main/java/com/ruoyi/quality/service/QualityTestStandardBindingService.java

@@ -18,4 +18,6 @@
public interface QualityTestStandardBindingService extends IService<QualityTestStandardBinding> {

    List<QualityTestStandardBindingDto> listBinding(Long testStandardId);

    int add(List<QualityTestStandardBinding> qualityTestStandardBindings);
}

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

@@ -1,5 +1,6 @@
package com.ruoyi.quality.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.quality.dto.QualityTestStandardBindingDto;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
@@ -28,4 +29,19 @@
    public List<QualityTestStandardBindingDto> listBinding(Long testStandardId) {
        return qualityTestStandardBindingMapper.listBinding(testStandardId);
    }

    @Override
    public int add(List<QualityTestStandardBinding> qualityTestStandardBindings) {
        //判断是否已经有绑定过的数据
        for (QualityTestStandardBinding qualityTestStandardBinding : qualityTestStandardBindings) {
            List<QualityTestStandardBinding> testStandardBindings = qualityTestStandardBindingMapper.selectList(Wrappers.<QualityTestStandardBinding>lambdaQuery()
                    .eq(QualityTestStandardBinding::getTestStandardId, qualityTestStandardBinding.getTestStandardId())
                    .eq(QualityTestStandardBinding::getProductId, qualityTestStandardBinding.getProductId()));
            if (testStandardBindings.size() > 0){
                throw new RuntimeException("该产品已经绑定过,请检查");
            }
        }
        saveBatch(qualityTestStandardBindings);
        return 0;
    }
}

 src/main/resources/static/safe-training.docx

Binary files differ