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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index cbd6eb4..05d262c 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -8,7 +8,6 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.R;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -29,6 +28,7 @@
* @param supplierManage
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
@@ -40,6 +40,7 @@
* @param ids
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
@@ -64,6 +65,7 @@
* @param supplierManage
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
@@ -86,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);
@@ -103,8 +106,12 @@
*/
@PostMapping("/import")
@Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
- public R importData(MultipartFile file) throws Exception {
- return supplierService.importData(file);
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
}
--
Gitblit v1.9.3