From 1284fb157043e488aa1794d8f1b64ebf18aa5147 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide

---
 src/main/java/com/ruoyi/account/service/AccountExpenseService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
index dcff4d9..4107a32 100644
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
@@ -7,6 +7,7 @@
 import com.ruoyi.account.dto.AccountDto2;
 import com.ruoyi.account.dto.AccountDto3;
 import com.ruoyi.account.pojo.AccountExpense;
+import com.ruoyi.account.pojo.AccountIncome;
 import com.ruoyi.dto.DateQueryDto;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,4 +25,10 @@
     List<AccountDto3> reportExpense();
 
     Map<String,List<String>> analysis();
+
+    Map<String, Object> categoryReport(DateQueryDto dateQueryDto);
+
+    AccountExpense getByInvoiceNumber(String purchaseContractNumber);
+
+    List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
 }

--
Gitblit v1.9.3