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/mapper/ReceiptPaymentMapper.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java index 696de82..ac590cf 100644 --- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java +++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java @@ -6,10 +6,12 @@ import com.ruoyi.sales.dto.CustomerInteractionDto; import com.ruoyi.sales.dto.InvoiceLedgerDto; import com.ruoyi.sales.dto.ReceiptPaymentDto; +import com.ruoyi.sales.dto.ReceiptPaymentExeclDto; import com.ruoyi.sales.pojo.ReceiptPayment; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> { @@ -24,7 +26,7 @@ * @param receiptPaymentDto * @return */ - IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto); + IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto); /** * 寮�绁ㄥ彴璐﹁鎯� @@ -62,4 +64,15 @@ * 鏌ヨ鍥炴璁板綍涓嶅垎椤� */ List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto); + + /** + * 閫氳繃寮�绁ㄧ櫥璁颁骇鍝乮d鏌ヨ鏄惁宸茬粡鏈夊洖娆捐褰� + * @param invoiceRegistrationProductId + * @return + */ + List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId); + + List<ReceiptPaymentDto> bindInvoiceNoRegListAll(); + + List<ReceiptPaymentExeclDto> bindInvoiceNoRegListByIds(List<Long> ids); } -- Gitblit v1.9.3