From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期

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

--
Gitblit v1.9.3