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

liyong

7 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

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

@@ -4,30 +4,37 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffOnJobService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Nonnull;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * 检测指标维护
 * <p>
 * 检测标准主表 前端控制器
 * </p>
 *
 * @author 芯导软件（江苏）有限公司
 * @since 2026-01-13 03:40:24
 */
@RestController
@RequestMapping("/quality/qualityTestStandard")
@RequestMapping("/qualityTestStandard")
public class QualityTestStandardController {

    @Resource
    private IQualityTestStandardService qualityTestStandardService;

    @Resource
    private QualityTestStandardParamService qualityTestStandardParamService;


    /**
     * 新增检测指标维护
     * 新增检测标准主表
     * @param qualityTestStandard
     * @return
     */
@@ -37,7 +44,7 @@
    }

    /**
     * 删除检测指标维护
     * 删除检测标准主表
     * @param ids
     * @return
     */
@@ -46,21 +53,11 @@
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
        return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
    }

    /**
     * 检测指标维护详情
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityTestStandardService.getById(id));
    }

    /**
     * 检测指标维护修改
     * 检测标准主表修改
     * @param qualityTestStandard
     * @return
     */
@@ -70,7 +67,7 @@
    }

    /**
     *检测指标维护分页查询
     *检测标准主表分页查询
     * @param page
     * @param qualityTestStandard
     * @return
@@ -81,24 +78,41 @@
    }

    /**
     * 检测指标维护导出
     * @param response
     * 检测标准复制参数
     * @param qualityTestStandard
     * @return
     */
    @PostMapping("/export")
    public void qualityTestStandardListPageExport(HttpServletResponse response,QualityTestStandard qualityTestStandard) {
        qualityTestStandardService.qualityTestStandardListPageExport(response, qualityTestStandard);
    @PostMapping("/copyParam")
    public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }

    /**
     * 详情
     * @param productId
     * 检测标准批量审核
     * @param qualityTestStandards
     * @return
     */
    @GetMapping("/product/{productId}")
    public AjaxResult QualityInspectDetail(@PathVariable("productId") Long productId) {
        return AjaxResult.success(qualityTestStandardService.list(Wrappers.<QualityTestStandard>lambdaQuery().eq(QualityTestStandard::getProductId,productId)));
    @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)));
    }

}