From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/service/AccountIncomeService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
index ab7036a..1f5d684 100644
--- a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
@@ -3,11 +3,12 @@
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.dto.AccountDto2;
-import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.bean.dto.AccountDto2;
+import com.ruoyi.account.bean.dto.AccountDto3;
+import com.ruoyi.account.bean.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> {
@@ -17,7 +18,9 @@
void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);
- List<AccountDto3> reportIncome();
+ List<AccountDto3> reportIncome(ReportDateDto reportDateDto);
AccountIncome getByInvoiceNumber(String purchaseContractNumber);
+
+ List<AccountIncome> getByInvoiceNumberList(String purchaseContractNumber);
}
--
Gitblit v1.9.3