From c1babcfa8a9cd01dbeb8527a6a95cbcc431957c7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 22 四月 2026 10:42:35 +0800
Subject: [PATCH] fix:生产模块

---
 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 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 ebaa40f..795b46d 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,20 +1,21 @@
 package com.ruoyi.account.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
 import com.ruoyi.framework.security.LoginUser;
 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;
 
@@ -23,10 +24,14 @@
  */
 @RestController
 @RequestMapping("/account/accountExpense")
+@Api(tags = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
 public class AccountExpenseController {
 
     @Resource
     private AccountExpenseService accountExpenseService;
+
+    @Resource
+    private AccountIncomeService accountIncomeService;
 
 
     /**
@@ -35,6 +40,7 @@
      * @return
      */
     @PostMapping("/add")
+    @ApiOperation("鏂板")
     public AjaxResult add(@RequestBody AccountExpense accountExpense) {
         accountExpense.setInputTime(new Date());
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -48,6 +54,7 @@
      * @return
      */
     @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
     public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -62,6 +69,7 @@
      * @return
      */
     @PostMapping("/update")
+    @ApiOperation("淇敼")
     public AjaxResult update(@RequestBody AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.updateById(accountExpense));
     }
@@ -73,6 +81,7 @@
      * @return
      */
     @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
     public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
         return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
     }
@@ -83,6 +92,7 @@
      * @return
      */
     @GetMapping("/{id}")
+    @ApiOperation("璇︽儏")
     public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
         return AjaxResult.success(accountExpenseService.getById(id));
     }
@@ -93,6 +103,7 @@
      * @param accountExpense
      */
     @PostMapping("/export")
+    @ApiOperation("瀵煎嚭")
     public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
         accountExpenseService.accountExpenseExport(response, accountExpense);
     }
@@ -103,9 +114,42 @@
      * @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());
+    }
+
+    /**
+     * 璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ
+     * @param
+     * @return
+     */
+    @GetMapping("/report/income")
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
+    public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+        return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
+    }
+
+    /**
+     * 璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ
+     * @param
+     * @return
+     */
+    @GetMapping("/report/expense")
+    @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
+    public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+        return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
+    }
+
 
 }

--
Gitblit v1.9.3