From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/account/service/AccountIncomeService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
index a92a51a..33bb02f 100644
--- a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.account.pojo.AccountFile;
+import com.ruoyi.account.dto.AccountDto2;
+import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountIncome;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
public interface AccountIncomeService extends IService<AccountIncome> {
@@ -14,4 +17,10 @@
IPage<AccountIncome> accountIncomeListPage(Page page, AccountIncome accountIncome);
void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);
+
+ List<AccountDto3> reportIncome(ReportDateDto reportDateDto);
+
+ AccountIncome getByInvoiceNumber(String purchaseContractNumber);
+
+ List<AccountIncome> getByInvoiceNumberList(String purchaseContractNumber);
}
--
Gitblit v1.9.3