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 |   25 ++++++++++++++++---------
 1 files changed, 16 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 02796b4..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;
 
@@ -42,6 +40,7 @@
      * @return
      */
     @PostMapping("/add")
+    @ApiOperation("鏂板")
     public AjaxResult add(@RequestBody AccountExpense accountExpense) {
         accountExpense.setInputTime(new Date());
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -55,6 +54,7 @@
      * @return
      */
     @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
     public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -69,6 +69,7 @@
      * @return
      */
     @PostMapping("/update")
+    @ApiOperation("淇敼")
     public AjaxResult update(@RequestBody AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.updateById(accountExpense));
     }
@@ -80,6 +81,7 @@
      * @return
      */
     @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
     public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
     }
@@ -90,6 +92,7 @@
      * @return
      */
     @GetMapping("/{id}")
+    @ApiOperation("璇︽儏")
     public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
         return AjaxResult.success(accountExpenseService.getById(id));
     }
@@ -100,6 +103,7 @@
      * @param accountExpense
      */
     @PostMapping("/export")
+    @ApiOperation("瀵煎嚭")
     public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
         accountExpenseService.accountExpenseExport(response, accountExpense);
     }
@@ -110,6 +114,7 @@
      * @return
      */
     @GetMapping("/report/forms")
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
     public AjaxResult report(DateQueryDto dateQueryDto) {
         return AjaxResult.success(accountExpenseService.report(dateQueryDto));
     }
@@ -130,8 +135,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));
     }
 
     /**
@@ -140,8 +146,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