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/basic/controller/SupplierManageController.java |   50 +++++++++++++++++++++++++++-----------------------
 1 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index b50f88f..f1a45d1 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -4,22 +4,23 @@
 import com.ruoyi.basic.dto.SupplierManageDto;
 import com.ruoyi.basic.pojo.SupplierManage;
 import com.ruoyi.basic.service.ISupplierService;
+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.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.framework.web.domain.R;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
 @RequestMapping("/system/supplier")
+@AllArgsConstructor
 public class SupplierManageController {
 
-    @Autowired
     private ISupplierService supplierService;
 
     /**
@@ -28,9 +29,9 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SupplierManage supplierManage) {
+    public R add(@RequestBody SupplierManage supplierManage) {
         supplierService.saveSupplier(supplierManage);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -39,12 +40,12 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+    public R delSupplier(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         supplierService.delSupplier(ids);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -53,8 +54,8 @@
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(supplierService.supplierDetail(id));
+    public R supplierDetail(@PathVariable("id") Integer id) {
+        return R.ok(supplierService.supplierDetail(id));
     }
 
     /**
@@ -63,9 +64,9 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+    public R update(@RequestBody SupplierManage supplierManage) {
         supplierService.supplierUpdate(supplierManage);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     /**
@@ -75,8 +76,8 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
-        return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
+    public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+        return R.ok(supplierService.supplierListPage(page, supplierManageDto));
     }
 
     /**
@@ -89,17 +90,20 @@
         supplierService.supplierExport(response, supplierManageDto);
     }
 
+    @PostMapping("/downloadTemplate")
+    @Log(title = "渚涘簲鍟�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+    public void downloadTemplate(HttpServletResponse response) {
+        ExcelUtil<SupplierManage> util = new ExcelUtil<SupplierManage>(SupplierManage.class);
+        util.importTemplateExcel(response, "渚涘簲鍟嗘。妗堟ā鏉�");
+    }
+
     /**
      * 渚涘簲鍟嗗鍏�
      */
     @PostMapping("/import")
     @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
-    public AjaxResult importData(MultipartFile file) {
-        Boolean b = supplierService.importData(file);
-        if (b) {
-            return AjaxResult.success("瀵煎叆鎴愬姛");
-        }
-        return AjaxResult.error("瀵煎叆澶辫触");
+    public R importData(MultipartFile file) throws Exception {
+       return supplierService.importData(file);
     }
 
 
@@ -108,7 +112,7 @@
      * @return
      */
     @GetMapping("/getOptions")
-    public AjaxResult getOptions() {
-        return AjaxResult.success(supplierService.list());
+    public R getOptions() {
+        return R.ok(supplierService.list());
     }
 }

--
Gitblit v1.9.3