From 2f20856ea3ca6f2f238ba66252164687f47fcd7e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:24:11 +0800
Subject: [PATCH] chore(deps): 更新 mybatis-plus 版本到 3.5.15
---
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..795b46d 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,11 +1,9 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.mapper.AccountIncomeMapper;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
-import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.dto.DateQueryDto;
@@ -13,11 +11,11 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
@@ -138,8 +136,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 +147,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