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/QualityUnqualifiedController.java |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 3b20f82..a2222c3 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -1,9 +1,13 @@
 package com.ruoyi.quality.controller;
 
 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.QualityUnqualified;
 import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,6 +20,7 @@
  */
 @RestController
 @RequestMapping("/quality/qualityUnqualified")
+@Tag(name = "涓嶅悎鏍肩鐞�")
 public class QualityUnqualifiedController {
 
     @Resource
@@ -28,9 +33,11 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
+    @Operation(summary = "鏂板涓嶅悎鏍肩鐞�")
+    @Log(title = "鏂板涓嶅悎鏍肩鐞�", businessType = BusinessType.INSERT)
+    public R<?> add(@RequestBody QualityUnqualified qualityUnqualified) {
         qualityUnqualified.setInspectState(0);
-        return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
+        return R.ok(qualityUnqualifiedService.save(qualityUnqualified));
     }
 
     /**
@@ -39,13 +46,15 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+    @Operation(summary = "鍒犻櫎涓嶅悎鏍肩鐞�")
+    @Log(title = "鍒犻櫎涓嶅悎鏍肩鐞�", businessType = BusinessType.DELETE)
+    public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
        qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
            if (qualityUnqualified.getInspectState()==1){
                throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
            }
        });
-        return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
+        return R.ok(qualityUnqualifiedService.removeBatchByIds(ids));
     }
 
     /**
@@ -54,8 +63,10 @@
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
+    @Operation(summary = "涓嶅悎鏍肩鐞嗚鎯�")
+    @Log(title = "涓嶅悎鏍肩鐞嗚鎯�", businessType = BusinessType.OTHER)
+    public R<?> QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
+        return R.ok(qualityUnqualifiedService.getUnqualified(id));
     }
 
     /**
@@ -64,8 +75,10 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
-        return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
+    @Operation(summary = "涓嶅悎鏍肩鐞嗕慨鏀�")
+    @Log(title = "涓嶅悎鏍肩鐞嗕慨鏀�", businessType = BusinessType.UPDATE)
+    public R<?> update(@RequestBody QualityUnqualified qualityUnqualified) {
+        return R.ok(qualityUnqualifiedService.updateById(qualityUnqualified));
     }
 
     /**
@@ -75,8 +88,10 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
-        return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
+    @Operation(summary = "涓嶅悎鏍肩鐞嗗垎椤垫煡璇�")
+    @Log(title = "涓嶅悎鏍肩鐞嗗垎椤垫煡璇�", businessType = BusinessType.OTHER)
+    public R<?> qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
+        return R.ok(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
     }
 
     /**
@@ -85,6 +100,8 @@
      * @param qualityUnqualified
      */
     @PostMapping("/export")
+    @Operation(summary = "涓嶅悎鏍肩鐞嗗鍑�")
+    @Log(title = "涓嶅悎鏍肩鐞嗗鍑�", businessType = BusinessType.EXPORT)
     public void qualityUnqualifiedExport(HttpServletResponse response,QualityUnqualified qualityUnqualified) {
         qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
     }
@@ -95,8 +112,10 @@
      * @return
      */
     @PostMapping("/deal")
-    public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
-        return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
+    @Operation(summary = "涓嶅悎鏍肩鐞嗗鐞�")
+    @Log(title = "涓嶅悎鏍肩鐞嗗鐞�", businessType = BusinessType.OTHER)
+    public R<?> deal(@RequestBody QualityUnqualified qualityUnqualified) {
+        return R.ok(qualityUnqualifiedService.deal(qualityUnqualified));
     }
 
 

--
Gitblit v1.9.3