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/service/ReceiptPaymentService.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 0413682..85a7a4c 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -2,10 +2,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.sales.dto.CustomerInteractionDto;
 import com.ruoyi.sales.dto.InvoiceLedgerDto;
 import com.ruoyi.sales.dto.ReceiptPaymentDto;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -71,4 +73,31 @@
      * 鏌ヨ鍥炴璁板綍
      */
     List<ReceiptPaymentDto> receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto);
+
+    /**
+     * 鏌ヨ鍥炴璁板綍鍒嗛〉
+     */
+    IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto);
+
+    /**
+     * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
+     * @param receiptPaymentDto
+     * @return
+     */
+    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+
+    /**
+     * 鏌ヨ鍥炴璁板綍鍒嗛〉
+     */
+    List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto);
+
+    /**
+     * 鍏ㄥ鍑哄洖娆惧垪琛�
+     */
+    void exportPaymentList(HttpServletResponse response);
+
+    /**
+     * 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃
+     */
+    void exportPaymentList(HttpServletResponse response, List<Long> ids);
 }

--
Gitblit v1.9.3