From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/basic/controller/SupplierManageController.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 37e4925..05d262c 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -7,7 +7,7 @@
 import com.ruoyi.common.utils.poi.ExcelUtil;
 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.framework.web.domain.AjaxResult;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
@@ -28,10 +28,11 @@
      * @param supplierManage
      * @return
      */
+    @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public R add(@RequestBody SupplierManage supplierManage) {
+    public AjaxResult add(@RequestBody SupplierManage supplierManage) {
         supplierService.saveSupplier(supplierManage);
-        return R.ok();
+        return AjaxResult.success();
     }
 
     /**
@@ -39,13 +40,14 @@
      * @param ids
      * @return
      */
+    @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.DELETE)
     @DeleteMapping("/del")
-    public R delSupplier(@RequestBody List<Integer> ids) {
+    public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         supplierService.delSupplier(ids);
-        return R.ok();
+        return AjaxResult.success();
     }
 
     /**
@@ -54,8 +56,8 @@
      * @return
      */
     @GetMapping("/{id}")
-    public R supplierDetail(@PathVariable("id") Integer id) {
-        return R.ok(supplierService.supplierDetail(id));
+    public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
+        return AjaxResult.success(supplierService.supplierDetail(id));
     }
 
     /**
@@ -63,10 +65,11 @@
      * @param supplierManage
      * @return
      */
+    @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
-    public R update(@RequestBody SupplierManage supplierManage) {
+    public AjaxResult update(@RequestBody SupplierManage supplierManage) {
         supplierService.supplierUpdate(supplierManage);
-        return R.ok();
+        return AjaxResult.success();
     }
 
     /**
@@ -76,8 +79,8 @@
      * @return
      */
     @GetMapping("/listPage")
-    public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
-        return R.ok(supplierService.supplierListPage(page, supplierManageDto));
+    public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+        return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
     }
 
     /**
@@ -85,6 +88,7 @@
      * @param response
      * @param supplierManageDto
      */
+    @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
         supplierService.supplierExport(response, supplierManageDto);
@@ -102,12 +106,12 @@
      */
     @PostMapping("/import")
     @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
-    public R importData(MultipartFile file) {
+    public AjaxResult importData(MultipartFile file) {
         Boolean b = supplierService.importData(file);
         if (b) {
-            return R.ok("瀵煎叆鎴愬姛");
+            return AjaxResult.success("瀵煎叆鎴愬姛");
         }
-        return R.fail("瀵煎叆澶辫触");
+        return AjaxResult.error("瀵煎叆澶辫触");
     }
 
 
@@ -116,7 +120,7 @@
      * @return
      */
     @GetMapping("/getOptions")
-    public R getOptions() {
-        return R.ok(supplierService.list());
+    public AjaxResult getOptions() {
+        return AjaxResult.success(supplierService.list());
     }
 }

--
Gitblit v1.9.3