From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 19 +++++++++++++------
1 files changed, 13 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..98b1105 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,19 @@
@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, String ids) {
+ if (ids == null || ids.isEmpty()) {
+ receiptPaymentService.exportPaymentList(response, null);
+ } else {
+ ArrayList<Long> idList = (ArrayList<Long>) Arrays.stream(ids.split(","))
+ .map(s -> s.replaceAll("[\\[\\]]", "").trim())
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ receiptPaymentService.exportPaymentList(response, idList);
+ }
}
+
/**
* 寮�绁ㄥ彴璐﹁鎯�
* @param id
--
Gitblit v1.9.3