From da0e9fff7f8ba1bd163836240ebb9935fa5c25ef Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 13:47:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index a6d771f..23e2508 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
@@ -138,8 +139,8 @@
*/
@GetMapping("/report/income")
@ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
- public AjaxResult reportIncome() {
- return AjaxResult.success(accountIncomeService.reportIncome());
+ public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
}
/**
@@ -149,8 +150,8 @@
*/
@GetMapping("/report/expense")
@ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
- public AjaxResult reportExpense() {
- return AjaxResult.success(accountExpenseService.reportExpense());
+ public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
}
--
Gitblit v1.9.3