From 1b5604f8a88000e2f51d4c989fd179989468ee67 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' into pim_ywx
---
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index ebaa40f..44d1dbd 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.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
@@ -27,6 +28,9 @@
@Resource
private AccountExpenseService accountExpenseService;
+
+ @Resource
+ private AccountIncomeService accountIncomeService;
/**
@@ -107,5 +111,25 @@
return AjaxResult.success(accountExpenseService.report(dateQueryDto));
}
+ /**
+ * 璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ
+ * @param
+ * @return
+ */
+ @GetMapping("/report/income")
+ public AjaxResult reportIncome() {
+ return AjaxResult.success(accountIncomeService.reportIncome());
+ }
+
+ /**
+ * 璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ
+ * @param
+ * @return
+ */
+ @GetMapping("/report/expense")
+ public AjaxResult reportExpense() {
+ return AjaxResult.success(accountExpenseService.reportExpense());
+ }
+
}
--
Gitblit v1.9.3