From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA

---
 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index fcaceb6..dc05d88 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.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.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.dto.QualityInspectDto;
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -10,7 +12,9 @@
 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 jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -37,8 +41,10 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
-        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
+    @Operation(summary = "鏂板妫�楠�")
+    @Log(title = "鏂板妫�楠�", businessType = BusinessType.INSERT)
+    public R<?> add(@RequestBody QualityInspectDto qualityInspectDto) {
+        return R.ok(qualityInspectService.add(qualityInspectDto));
     }
 
     /**
@@ -48,9 +54,11 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+    @Operation(summary = "鍒犻櫎妫�楠�")
+    @Log(title = "鍒犻櫎妫�楠�", businessType = BusinessType.DELETE)
+    public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
         if (CollectionUtils.isEmpty(ids)) {
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         //濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
         List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
@@ -66,7 +74,7 @@
         qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
                 .in(QualityInspectFile::getInspectId, ids));
         //鍒犻櫎妫�楠屽崟
-        return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
+        return R.ok(qualityInspectService.removeBatchByIds(ids));
     }
 
     /**
@@ -76,8 +84,10 @@
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(qualityInspectService.getDetailById(id));
+    @Operation(summary = "妫�楠岃鎯�")
+    @Log(title = "妫�楠岃鎯�", businessType = BusinessType.OTHER)
+    public R<?> QualityInspectDetail(@PathVariable("id") Integer id) {
+        return R.ok(qualityInspectService.getDetailById(id));
     }
 
     /**
@@ -87,8 +97,10 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
-        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
+    @Operation(summary = "淇敼妫�楠�")
+    @Log(title = "淇敼妫�楠�", businessType = BusinessType.UPDATE)
+    public R<?> update(@RequestBody QualityInspectDto qualityInspectDto) {
+        return R.ok(qualityInspectService.updateQualityInspect(qualityInspectDto));
     }
 
     /**
@@ -99,8 +111,10 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
-        return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
+    @Operation(summary = "鍒嗛〉鏌ヨ妫�楠�")
+    @Log(title = "鍒嗛〉鏌ヨ妫�楠�", businessType = BusinessType.OTHER)
+    public R<?> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+        return R.ok(qualityInspectService.qualityInspectListPage(page, qualityInspect));
     }
 
     /**
@@ -110,6 +124,8 @@
      * @param qualityInspect
      */
     @PostMapping("/export")
+    @Operation(summary = "瀵煎嚭妫�楠�")
+    @Log(title = "瀵煎嚭妫�楠�", businessType = BusinessType.EXPORT)
     public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
         qualityInspectService.qualityInspectExport(response, qualityInspect);
     }
@@ -121,8 +137,10 @@
      * @return
      */
     @PostMapping("/submit")
-    public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
-        return AjaxResult.success(qualityInspectService.submit(qualityInspect));
+    @Operation(summary = "鎻愪氦妫�楠�")
+    @Log(title = "鎻愪氦妫�楠�", businessType = BusinessType.OTHER)
+    public R<?> submit(@Valid @RequestBody QualityInspect qualityInspect) {
+        return R.ok(qualityInspectService.submit(qualityInspect));
     }
 
     /**
@@ -132,6 +150,8 @@
      * @param qualityInspect
      */
     @PostMapping("/down")
+    @Operation(summary = "涓嬭浇妫�楠�")
+    @Log(title = "涓嬭浇妫�楠�", businessType = BusinessType.OTHER)
     public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
         qualityInspectService.down(response, qualityInspect);
     }

--
Gitblit v1.9.3