From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet

---
 src/main/java/com/ruoyi/account/service/AccountExpenseService.java |   10 ++++++++++
 1 files changed, 10 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 a1f2677..621641b 100644
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
@@ -4,11 +4,15 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.account.dto.AccountDto;
+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;
+import java.util.List;
+import java.util.Map;
 
 public interface AccountExpenseService extends IService<AccountExpense> {
 
@@ -17,4 +21,10 @@
     void accountExpenseExport(HttpServletResponse response, AccountExpense accountExpense);
 
     AccountDto report(DateQueryDto dateQueryDto);
+
+    List<AccountDto3> reportExpense();
+
+    Map<String,List<String>> analysis();
+
+    AccountExpense getByInvoiceNumber(String purchaseContractNumber);
 }

--
Gitblit v1.9.3