Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 3a76f9efb61f7bdbf96dfa429214ee0c8322a539

 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;
@@ -10,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.*;

@@ -23,10 +26,14 @@
 */
@RestController
@RequestMapping("/account/accountExpense")
@Api(tags = "财务管理--支出管理")
public class AccountExpenseController {

    @Resource
    private AccountExpenseService accountExpenseService;

    @Resource
    private AccountIncomeService accountIncomeService;


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

    /**
     * 财务报表-财务分析
     * @return
     */
    @GetMapping("/report/analysis")
    @ApiOperation("财务报表-财务分析")
    public AjaxResult analysis() {
        return AjaxResult.success(accountExpenseService.analysis());
    }

    /**
     * 财务报表图表收入年度查询
     * @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());
    }


}