From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 11:45:48 +0800
Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】，合同金额列后面增加已开票金额、待开票金额两列
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 104f3d0..ec9ce02 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -16,7 +16,9 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/receiptPayment")
@@ -102,14 +104,21 @@
@ApiModelProperty("瀵煎嚭鍥炴鐧昏")
@PostMapping("/export")
- public void export(HttpServletResponse response, ArrayList<Long> ids) {
- //ids閫夋嫨灏辨槸鍏ㄥ鍑�
-// if (ids == null || ids.size() == 0) {
-// receiptPaymentService.exportPaymentList(response);
-// }
- receiptPaymentService.exportPaymentList(response, ids);
+ public void export(HttpServletResponse response, @RequestParam("ids") String idsStr) {
+ if (idsStr == null || idsStr.trim().isEmpty()) {
+ throw new RuntimeException("璇烽�夋嫨瑕佸鍑虹殑璁板綍");
+ }
+
+ ArrayList<Long> ids = (ArrayList<Long>) Arrays.stream(idsStr.split(","))
+ .map(s -> s.replaceAll("[\\[\\]]", "").trim())
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+
+
+ receiptPaymentService.exportPaymentList(response, ids);
}
+
/**
* 寮�绁ㄥ彴璐﹁鎯�
* @param id
--
Gitblit v1.9.3