Merge remote-tracking branch 'origin/pim_yys' into pim_ywx

yaowanxin

2025-08-11 1b5604f8a88000e2f51d4c989fd179989468ee67

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -37,12 +38,12 @@

    /**
     * 新增
     * @param qualityInspect
     * @param qualityInspectDto
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.add(qualityInspect));
    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
    }

    /**
@@ -72,17 +73,17 @@
     */
    @GetMapping("/{id}")
    public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityInspectService.getById(id));
        return AjaxResult.success(qualityInspectService.getDetailById(id));
    }

    /**
     * 修改
     * @param qualityInspect
     * @param qualityInspectDto
     * @return
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspect));
    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
    }

    /**
@@ -106,5 +107,23 @@
        qualityInspectService.qualityInspectExport(response, qualityInspect);
    }

    /**
     * 提交
     * @param id
     * @return
     */
    @PostMapping("/submit")
    public AjaxResult submit(Integer id) {
        return AjaxResult.success(qualityInspectService.submit(id));
    }

    /**
     * 下载
     * @param response
     * @param id
     */
    @PostMapping("/down")
    public void down(HttpServletResponse response,Integer id) {
        qualityInspectService.down(response, id);
    }
}