feat(production): 完善生产订单管理功能

云

2026-04-23 0005d49a697ce934c6fc2a61ecb75d881b9a76f2

 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java

@@ -1,11 +1,9 @@
package com.ruoyi.account.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.mapper.AccountIncomeMapper;
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;
@@ -13,11 +11,11 @@
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;

@@ -138,8 +136,8 @@
     */
    @GetMapping("/report/income")
    @ApiOperation("财务报表图表收入年度查询")
    public AjaxResult reportIncome() {
        return AjaxResult.success(accountIncomeService.reportIncome());
    public AjaxResult reportIncome(ReportDateDto reportDateDto) {
        return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
    }

    /**
@@ -149,8 +147,8 @@
     */
    @GetMapping("/report/expense")
    @ApiOperation("财务报表图表支出年度查询")
    public AjaxResult reportExpense() {
        return AjaxResult.success(accountExpenseService.reportExpense());
    public AjaxResult reportExpense(ReportDateDto reportDateDto) {
        return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
    }