Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.bean.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
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 com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,8 +25,8 @@
 */
@RestController
@RequestMapping("/account/accountExpense")
@Api(tags = "财务管理--支出管理")
public class AccountExpenseController {
@Tag(name = "财务管理--支出管理")
public class AccountExpenseController extends BaseController {

    @Resource
    private AccountExpenseService accountExpenseService;
@@ -40,12 +41,12 @@
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody AccountExpense accountExpense) {
    @Operation(summary = "新增")
    public R<?> add(@RequestBody AccountExpense accountExpense) {
        accountExpense.setInputTime(new Date());
        LoginUser loginUser = SecurityUtils.getLoginUser();
        accountExpense.setInputUser(loginUser.getNickName());
        return AjaxResult.success(accountExpenseService.save(accountExpense));
        return R.ok(accountExpenseService.save(accountExpense));
    }

    /**
@@ -54,13 +55,13 @@
     * @return
     */
    @DeleteMapping("/del")
    @ApiOperation("删除")
    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
    @Operation(summary = "删除")
    public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
            return R.fail("请选择至少一条数据");
        }
        //删除检验单
        return AjaxResult.success(accountExpenseService.removeBatchByIds(ids));
        return R.ok(accountExpenseService.removeBatchByIds(ids));
    }

    /**
@@ -69,9 +70,9 @@
     * @return
     */
    @PostMapping("/update")
    @ApiOperation("修改")
    public AjaxResult update(@RequestBody AccountExpense accountExpense) {
        return AjaxResult.success(accountExpenseService.updateById(accountExpense));
    @Operation(summary = "修改")
    public R<?> update(@RequestBody AccountExpense accountExpense) {
        return R.ok(accountExpenseService.updateById(accountExpense));
    }

    /**
@@ -81,9 +82,9 @@
     * @return
     */
    @GetMapping("/listPage")
    @ApiOperation("分页查询")
    public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
        return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
    @Operation(summary = "分页查询")
    public R<?> accountExpenseListPage(Page page, AccountExpense accountExpense) {
        return R.ok(accountExpenseService.accountExpenseListPage(page, accountExpense));
    }

    /**
@@ -92,9 +93,9 @@
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation("详情")
    public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(accountExpenseService.getById(id));
    @Operation(summary = "详情")
    public R<?> accountExpenseDetail(@PathVariable("id") Integer id) {
        return R.ok(accountExpenseService.getById(id));
    }

    /**
@@ -103,7 +104,7 @@
     * @param accountExpense
     */
    @PostMapping("/export")
    @ApiOperation("导出")
    @Operation(summary = "导出")
    public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
        accountExpenseService.accountExpenseExport(response, accountExpense);
    }
@@ -114,9 +115,9 @@
     * @return
     */
    @GetMapping("/report/forms")
    @ApiOperation("财务报表图表查询")
    public AjaxResult report(DateQueryDto dateQueryDto) {
        return AjaxResult.success(accountExpenseService.report(dateQueryDto));
    @Operation(summary = "财务报表图表查询")
    public R<?> report(DateQueryDto dateQueryDto) {
        return R.ok(accountExpenseService.report(dateQueryDto));
    }

    /**
@@ -124,9 +125,9 @@
     * @return
     */
    @GetMapping("/report/analysis")
    @ApiOperation("财务报表-财务分析")
    public AjaxResult analysis() {
        return AjaxResult.success(accountExpenseService.analysis());
    @Operation(summary = "财务报表-财务分析")
    public R<?> analysis() {
        return R.ok(accountExpenseService.analysis());
    }

    /**
@@ -135,9 +136,9 @@
     * @return
     */
    @GetMapping("/report/income")
    @ApiOperation("财务报表图表收入年度查询")
    public AjaxResult reportIncome(ReportDateDto reportDateDto) {
        return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
    @Operation(summary = "财务报表图表收入年度查询")
    public R<?> reportIncome(ReportDateDto reportDateDto) {
        return R.ok(accountIncomeService.reportIncome(reportDateDto));
    }

    /**
@@ -146,9 +147,9 @@
     * @return
     */
    @GetMapping("/report/expense")
    @ApiOperation("财务报表图表支出年度查询")
    public AjaxResult reportExpense(ReportDateDto reportDateDto) {
        return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
    @Operation(summary = "财务报表图表支出年度查询")
    public R<?> reportExpense(ReportDateDto reportDateDto) {
        return R.ok(accountExpenseService.reportExpense(reportDateDto));
    }