From 3a76f9efb61f7bdbf96dfa429214ee0c8322a539 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 11 九月 2025 16:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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..02796b4 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;
@@ -10,6 +11,8 @@
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -23,10 +26,14 @@
*/
@RestController
@RequestMapping("/account/accountExpense")
+@Api(tags = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
public class AccountExpenseController {
@Resource
private AccountExpenseService accountExpenseService;
+
+ @Resource
+ private AccountIncomeService accountIncomeService;
/**
@@ -107,5 +114,35 @@
return AjaxResult.success(accountExpenseService.report(dateQueryDto));
}
+ /**
+ * 璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽
+ * @return
+ */
+ @GetMapping("/report/analysis")
+ @ApiOperation("璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
+ public AjaxResult analysis() {
+ return AjaxResult.success(accountExpenseService.analysis());
+ }
+
+ /**
+ * 璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ
+ * @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