From 37b697351e8e0a9200eee1276c4081c07588dc10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 17 六月 2025 20:39:48 +0800
Subject: [PATCH] 未回款金额(元)为NaN修复
---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index d399212..b50f88f 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -4,9 +4,16 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+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 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")
@@ -28,12 +35,15 @@
/**
* 渚涘簲鍟嗗垹闄�
- * @param id
+ * @param ids
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplier(Integer id) {
- supplierService.delSupplier(id);
+ public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ supplierService.delSupplier(ids);
return AjaxResult.success();
}
@@ -42,8 +52,8 @@
* @param id
* @return
*/
- @GetMapping("/info")
- public AjaxResult supplierDetail(Integer id) {
+ @GetMapping("/{id}")
+ public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(supplierService.supplierDetail(id));
}
@@ -54,6 +64,7 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+ supplierService.supplierUpdate(supplierManage);
return AjaxResult.success();
}
@@ -67,4 +78,37 @@
public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
}
+
+ /**
+ * 渚涘簲鍟嗗鍑�
+ * @param response
+ * @param supplierManageDto
+ */
+ @PostMapping("/export")
+ public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
+ supplierService.supplierExport(response, supplierManageDto);
+ }
+
+ /**
+ * 渚涘簲鍟嗗鍏�
+ */
+ @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("瀵煎叆澶辫触");
+ }
+
+
+ /**
+ * 渚涘簲鍟嗛�夐」鎺ュ彛
+ * @return
+ */
+ @GetMapping("/getOptions")
+ public AjaxResult getOptions() {
+ return AjaxResult.success(supplierService.list());
+ }
}
--
Gitblit v1.9.3