Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

gongchunyi

6 天以前 09484518df0ab310dc8ee7b1caf118a90a409c63

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

@@ -1,12 +1,16 @@
package com.ruoyi.account.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.service.impl.AccountingServiceImpl;
import com.ruoyi.account.bean.dto.AccountReportDto;
import com.ruoyi.account.service.AccountingService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -19,28 +23,38 @@
@Tag(name = "会计核算")
@RestController
@RequestMapping("/accounting")
@AllArgsConstructor
@RequiredArgsConstructor
public class AccountingController extends BaseController {


    private AccountingServiceImpl accountingService;
    private final AccountingService accountingService;

    @Operation(summary = "总计")
    @GetMapping("/total")
    public R<?> total(@RequestParam Integer year) {
    public AjaxResult total(@RequestParam Integer year) {
        return accountingService.total(year);
    }

    @Operation(summary = "设备类型分布")
    @GetMapping("/deviceTypeDistribution")
    public R<?> deviceTypeDistribution(@RequestParam Integer year) {
    public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
        return accountingService.deviceTypeDistribution(year);
    }

    @Operation(summary = "设备分页查询计算折旧")
    @GetMapping("/calculateDepreciation")
    public R<?> calculateDepreciation(Page page, @RequestParam Integer year) {
    public AjaxResult calculateDepreciation(Page page, @RequestParam Integer year) {
        return accountingService.calculateDepreciation(page,year);
    }

    /*****************************************财务报表******************************************************************************/

    @GetMapping("/accountStatementDetailsByMonth")
    @Log(title = "统计总应收+总支出+总收入笔数+总支出笔数+净收入", businessType = BusinessType.OTHER)
    @Operation(summary = "财务报表--统计总应收+总支出+总收入笔数+总支出笔数+净收入")
    public R getAccountStatementDetailsByMonth(AccountReportDto accountReportDto) {
        return R.ok(accountingService.getAccountStatementDetailsByMonth(accountReportDto));
    }


}