From 3001173ec71036a44fc09ff56ad1d9e2cd6d3d38 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 五月 2026 11:24:38 +0800
Subject: [PATCH] fix(procurement): 修正退货管理及销售台账字段和查询逻辑
---
src/main/java/com/ruoyi/account/service/AccountExpenseService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
index 621641b..b070485 100644
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
@@ -3,14 +3,15 @@
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.AccountDto;
-import com.ruoyi.account.dto.AccountDto2;
-import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.bean.dto.AccountDto;
+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.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -22,9 +23,11 @@
AccountDto report(DateQueryDto dateQueryDto);
- List<AccountDto3> reportExpense();
+ List<AccountDto3> reportExpense(ReportDateDto reportDateDto);
Map<String,List<String>> analysis();
AccountExpense getByInvoiceNumber(String purchaseContractNumber);
+
+ List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
}
--
Gitblit v1.9.3