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/mapper/ReceiptPaymentMapper.java | 10 +++++++++- 1 files changed, 9 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 ad71e5c..e7b34ed 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); /** * 寮�绁ㄥ彴璐﹁鎯� @@ -69,4 +71,10 @@ * @return */ List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId); + + List<ReceiptPaymentDto> bindInvoiceNoRegListAll(); + + List<ReceiptPaymentExeclDto> bindInvoiceNoRegListByIds(List<Long> ids,Long tenantId); + + } -- Gitblit v1.9.3