From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
index f018413..6594640 100644
--- a/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
@@ -6,7 +6,6 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -41,7 +40,7 @@
* @param invoiceLedgerDto
* @return
*/
- IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);
+ IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page,@Param("invoiceLedgerDto") InvoiceLedgerDto invoiceLedgerDto);
/**
* 浜у搧寮�绁ㄥ彴璐﹁鎯�
@@ -50,4 +49,11 @@
*/
InvoiceRegistrationProductDto invoiceLedgerProductInfo(Integer id);
+ /**
+ * 鏍规嵁閿�鍞悎鍚岃绠楀凡寮�绁ㄩ噾棰�
+ * @param salesLedgerIds
+ * @return
+ */
+ List<InvoiceLedgerDto> invoicedTotal(@Param("salesLedgerIds") List<Long> salesLedgerIds);
+
}
--
Gitblit v1.9.3