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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index d934e46..05d262c 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 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;
/**
@@ -27,6 +28,7 @@
* @param supplierManage
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
@@ -38,6 +40,7 @@
* @param ids
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
@@ -62,6 +65,7 @@
* @param supplierManage
* @return
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
@@ -84,9 +88,17 @@
* @param response
* @param supplierManageDto
*/
+ @Log(title = "渚涘簲鍟嗙鐞�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
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, "渚涘簲鍟嗘。妗堟ā鏉�");
}
/**
@@ -95,7 +107,11 @@
@PostMapping("/import")
@Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
public AjaxResult importData(MultipartFile file) {
- return AjaxResult.success(supplierService.importData(file));
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
}
--
Gitblit v1.9.3