Merge remote-tracking branch 'origin/pim_yys' into pim_ywx

yaowanxin

2025-08-11 1b5604f8a88000e2f51d4c989fd179989468ee67

 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.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
@@ -27,6 +28,9 @@

    @Resource
    private AccountExpenseService accountExpenseService;

    @Resource
    private AccountIncomeService accountIncomeService;


    /**
@@ -107,5 +111,25 @@
        return AjaxResult.success(accountExpenseService.report(dateQueryDto));
    }

    /**
     * 财务报表图表收入年度查询
     * @param
     * @return
     */
    @GetMapping("/report/income")
    public AjaxResult reportIncome() {
        return AjaxResult.success(accountIncomeService.reportIncome());
    }

    /**
     * 财务报表图表支出年度查询
     * @param
     * @return
     */
    @GetMapping("/report/expense")
    public AjaxResult reportExpense() {
        return AjaxResult.success(accountExpenseService.reportExpense());
    }


}