Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

15 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Nonnull;
import javax.annotation.Resource;
import java.util.List;

@@ -24,6 +31,9 @@

    @Resource
    private IQualityTestStandardService qualityTestStandardService;

    @Resource
    private QualityTestStandardParamService qualityTestStandardParamService;


    /**
@@ -46,7 +56,7 @@
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
        return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
    }

    /**
@@ -80,4 +90,38 @@
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }

    /**
     * 检测标准批量审核
     * @param qualityTestStandards
     * @return
     */
    @PostMapping("/qualityTestStandardAudit")
    public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
        return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
    }

    /**
     * 根据产品id查询相关的检验标准
     * @return
     */
    @GetMapping("/getQualityTestStandardByProductId")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    }

    /**
     * 根据检测标准id查询相关的检验标准参数
     * @return
     */
    @GetMapping("/getQualityTestStandardParamByTestStandardId")
    public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
    }

    @ApiOperation("根据 工序或类别 查询对应参数项")
    @GetMapping("/getParameterItemByProcessOrCategory")
    public AjaxResult delete(@RequestParam(required = false) Long id, Integer inspectType) {
        return AjaxResult.success(qualityTestStandardService.getParameterItemByProcessOrCategory(id, inspectType));
    }

}