From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java |   69 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 24 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..ea80191 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,21 +1,22 @@
 package com.ruoyi.account.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.mapper.AccountIncomeMapper;
+import com.ruoyi.account.bean.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;
 import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+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;
 
@@ -24,7 +25,8 @@
  */
 @RestController
 @RequestMapping("/account/accountExpense")
-public class AccountExpenseController {
+@Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
+public class AccountExpenseController extends BaseController {
 
     @Resource
     private AccountExpenseService accountExpenseService;
@@ -39,11 +41,12 @@
      * @return
      */
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody AccountExpense accountExpense) {
+    @Operation(summary = "鏂板")
+    public R<?> add(@RequestBody AccountExpense accountExpense) {
         accountExpense.setInputTime(new Date());
         LoginUser loginUser = SecurityUtils.getLoginUser();
         accountExpense.setInputUser(loginUser.getNickName());
-        return AjaxResult.success(accountExpenseService.save(accountExpense));
+        return R.ok(accountExpenseService.save(accountExpense));
     }
 
     /**
@@ -52,12 +55,13 @@
      * @return
      */
     @DeleteMapping("/del")
-    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+    @Operation(summary = "鍒犻櫎")
+    public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
         //鍒犻櫎妫�楠屽崟
-        return AjaxResult.success(accountExpenseService.removeBatchByIds(ids));
+        return R.ok(accountExpenseService.removeBatchByIds(ids));
     }
 
     /**
@@ -66,8 +70,9 @@
      * @return
      */
     @PostMapping("/update")
-    public AjaxResult update(@RequestBody AccountExpense accountExpense) {
-        return AjaxResult.success(accountExpenseService.updateById(accountExpense));
+    @Operation(summary = "淇敼")
+    public R<?> update(@RequestBody AccountExpense accountExpense) {
+        return R.ok(accountExpenseService.updateById(accountExpense));
     }
 
     /**
@@ -77,8 +82,9 @@
      * @return
      */
     @GetMapping("/listPage")
-    public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
-        return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
+    @Operation(summary = "鍒嗛〉鏌ヨ")
+    public R<?> accountExpenseListPage(Page page, AccountExpense accountExpense) {
+        return R.ok(accountExpenseService.accountExpenseListPage(page, accountExpense));
     }
 
     /**
@@ -87,8 +93,9 @@
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(accountExpenseService.getById(id));
+    @Operation(summary = "璇︽儏")
+    public R<?> accountExpenseDetail(@PathVariable("id") Integer id) {
+        return R.ok(accountExpenseService.getById(id));
     }
 
     /**
@@ -97,6 +104,7 @@
      * @param accountExpense
      */
     @PostMapping("/export")
+    @Operation(summary = "瀵煎嚭")
     public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
         accountExpenseService.accountExpenseExport(response, accountExpense);
     }
@@ -107,8 +115,19 @@
      * @return
      */
     @GetMapping("/report/forms")
-    public AjaxResult report(DateQueryDto dateQueryDto) {
-        return AjaxResult.success(accountExpenseService.report(dateQueryDto));
+    @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
+    public R<?> report(DateQueryDto dateQueryDto) {
+        return R.ok(accountExpenseService.report(dateQueryDto));
+    }
+
+    /**
+     * 璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽
+     * @return
+     */
+    @GetMapping("/report/analysis")
+    @Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
+    public R<?> analysis() {
+        return R.ok(accountExpenseService.analysis());
     }
 
     /**
@@ -117,8 +136,9 @@
      * @return
      */
     @GetMapping("/report/income")
-    public AjaxResult reportIncome() {
-        return AjaxResult.success(accountIncomeService.reportIncome());
+    @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
+    public R<?> reportIncome(ReportDateDto reportDateDto) {
+        return R.ok(accountIncomeService.reportIncome(reportDateDto));
     }
 
     /**
@@ -127,8 +147,9 @@
      * @return
      */
     @GetMapping("/report/expense")
-    public AjaxResult reportExpense() {
-        return AjaxResult.success(accountExpenseService.reportExpense());
+    @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
+    public R<?> reportExpense(ReportDateDto reportDateDto) {
+        return R.ok(accountExpenseService.reportExpense(reportDateDto));
     }
 
 

--
Gitblit v1.9.3