From 34e986e6e158450ee35319f1cac872a4bc974a74 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 18:02:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 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 44d1dbd..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;
@@ -11,6 +12,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.*;
 
@@ -24,6 +27,7 @@
  */
 @RestController
 @RequestMapping("/account/accountExpense")
+@Api(tags = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
 public class AccountExpenseController {
 
     @Resource
@@ -39,6 +43,7 @@
      * @return
      */
     @PostMapping("/add")
+    @ApiOperation("鏂板")
     public AjaxResult add(@RequestBody AccountExpense accountExpense) {
         accountExpense.setInputTime(new Date());
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -52,6 +57,7 @@
      * @return
      */
     @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
     public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -66,6 +72,7 @@
      * @return
      */
     @PostMapping("/update")
+    @ApiOperation("淇敼")
     public AjaxResult update(@RequestBody AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.updateById(accountExpense));
     }
@@ -77,6 +84,7 @@
      * @return
      */
     @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
     public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
     }
@@ -87,6 +95,7 @@
      * @return
      */
     @GetMapping("/{id}")
+    @ApiOperation("璇︽儏")
     public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
         return AjaxResult.success(accountExpenseService.getById(id));
     }
@@ -97,6 +106,7 @@
      * @param accountExpense
      */
     @PostMapping("/export")
+    @ApiOperation("瀵煎嚭")
     public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
         accountExpenseService.accountExpenseExport(response, accountExpense);
     }
@@ -107,8 +117,19 @@
      * @return
      */
     @GetMapping("/report/forms")
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
     public AjaxResult report(DateQueryDto dateQueryDto) {
         return AjaxResult.success(accountExpenseService.report(dateQueryDto));
+    }
+
+    /**
+     * 璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽
+     * @return
+     */
+    @GetMapping("/report/analysis")
+    @ApiOperation("璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
+    public AjaxResult analysis() {
+        return AjaxResult.success(accountExpenseService.analysis());
     }
 
     /**
@@ -117,8 +138,9 @@
      * @return
      */
     @GetMapping("/report/income")
-    public AjaxResult reportIncome() {
-        return AjaxResult.success(accountIncomeService.reportIncome());
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
+    public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+        return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
     }
 
     /**
@@ -127,8 +149,9 @@
      * @return
      */
     @GetMapping("/report/expense")
-    public AjaxResult reportExpense() {
-        return AjaxResult.success(accountExpenseService.reportExpense());
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
+    public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+        return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
     }
 
 

--
Gitblit v1.9.3