From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index 795b46d..ea80191 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/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));
}
--
Gitblit v1.9.3