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

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -1,12 +1,9 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -22,36 +19,39 @@
 */
@RestController
@RequestMapping("/qualityTestStandardBinding")
@AllArgsConstructor
public class QualityTestStandardBindingController {

    @Autowired
    private QualityTestStandardBindingService qualityTestStandardBindingService;

    /**
     * 新增检测标准主表与产品关联表
     *
     * @param qualityTestStandardBindings
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
        return AjaxResult.success(qualityTestStandardBindingService.saveBatch(qualityTestStandardBindings));
        return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
    }

    /**
     * 删除检测标准主表与产品关联表
     *
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
        if (CollectionUtils.isEmpty(ids)) {
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids));
    }

    /**
     *检测指标维护查询
     * 检测指标维护查询
     *
     * @return
     */
    @GetMapping("/list")