From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 10:20:08 +0800 Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询,不显示待回款为0,默认为打钩。 销售管理】-【回款流水】,增加合同号、项目名称列查询,增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】,增加导出功能 --- src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 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 9801d3d..ac868fa 100644 --- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java +++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java @@ -3,10 +3,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 org.apache.ibatis.annotations.Param; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> { @@ -20,7 +25,7 @@ * @param receiptPaymentDto * @return */ - IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto); + IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto); /** * 寮�绁ㄥ彴璐﹁鎯� @@ -28,4 +33,45 @@ * @return */ InvoiceLedgerDto invoiceInfo(Integer id); + + /** + * 璁$畻鍓嶅灏戞潯鏁版嵁鍥炴閲戦缁煎悎 + * @param customerId + * @param total + * @return + */ + BigDecimal getReceiptAmount(@Param("customerId") Integer customerId, @Param("total") long total); + + /** + * 鏌ヨ鍥炴璁板綍 + */ + List<ReceiptPaymentDto> receiptPaymentHistoryList(@Param("params") ReceiptPaymentDto receiptPaymentDto); + + /** + * 鏌ヨ鍥炴璁板綍鍒嗛〉 + */ + IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page,@Param("params") ReceiptPaymentDto receiptPaymentDto); + + /** + * 瀹㈡埛寰�鏉ヨ褰曟煡璇� + * @param receiptPaymentDto + * @return + */ + List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto); + + /** + * 鏌ヨ鍥炴璁板綍涓嶅垎椤� + */ + List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto); + + /** + * 閫氳繃寮�绁ㄧ櫥璁颁骇鍝乮d鏌ヨ鏄惁宸茬粡鏈夊洖娆捐褰� + * @param invoiceRegistrationProductId + * @return + */ + List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId); + + List<ReceiptPaymentDto> bindInvoiceNoRegListAll(); + + List<ReceiptPaymentDto> bindInvoiceNoRegListByIds(ArrayList<Long> ids); } -- Gitblit v1.9.3