From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
index 263b201..48fc093 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
@@ -2,13 +2,16 @@
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.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -32,8 +35,10 @@
* @return
*/
@GetMapping("/{inspectId}")
- public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
- return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
+ @Operation(summary = "妫�楠屽弬鏁伴」璇︽儏")
+ @Log(title = "妫�楠屽弬鏁伴」璇︽儏", businessType = BusinessType.OTHER)
+ public R<?> QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
+ return R.ok(qualityInspectParamService.qualityInspectParamDetail(inspectId));
}
@@ -43,8 +48,10 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
- return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
+ @Operation(summary = "淇敼妫�楠屽弬鏁伴」")
+ @Log(title = "淇敼妫�楠屽弬鏁伴」", businessType = BusinessType.UPDATE)
+ public R<?> update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
+ return R.ok(qualityInspectParamService.updateBatchById(qualityInspectParams));
}
/**
@@ -53,11 +60,13 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ @Operation(summary = "鍒犻櫎妫�楠屽弬鏁伴」")
+ @Log(title = "鍒犻櫎妫�楠屽弬鏁伴」", businessType = BusinessType.DELETE)
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityInspectParamService.removeBatchByIds(ids));
+ return R.ok(qualityInspectParamService.removeBatchByIds(ids));
}
--
Gitblit v1.9.3