From a1160706d2940bcbd38233731691a999be1d4024 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 11 十月 2025 11:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 717044e..fa50217 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/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 qualityInspect
+ * @return
+ */
+ @PostMapping("/submit")
+ public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
+ return AjaxResult.success(qualityInspectService.submit(qualityInspect));
+ }
+ /**
+ * 涓嬭浇
+ * @param response
+ * @param qualityInspect
+ */
+ @PostMapping("/down")
+ public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
+ qualityInspectService.down(response, qualityInspect);
+ }
}
--
Gitblit v1.9.3