From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
index f32d87b..742fef5 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+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.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -33,9 +35,10 @@
* @param qualityInspectFile
* @return
*/
+ @Log(title = "涓婁紶璐ㄦ鏂囦欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody QualityInspectFile qualityInspectFile) {
- return R.ok(qualityInspectFileService.save(qualityInspectFile));
+ public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
+ return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
}
/**
@@ -43,13 +46,14 @@
* @param ids
* @return
*/
+ @Log(title = "鍒犻櫎璐ㄦ鏂囦欢", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return R.ok(qualityInspectFileService.removeBatchByIds(ids));
+ return AjaxResult.success(qualityInspectFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +63,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
- return R.ok(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
+ public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
+ return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
}
--
Gitblit v1.9.3