From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/account/controller/AccountExpenseController.java |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index 9d49919..ea80191 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -8,7 +8,8 @@
 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 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;
@@ -25,7 +26,7 @@
 @RestController
 @RequestMapping("/account/accountExpense")
 @Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
-public class AccountExpenseController {
+public class AccountExpenseController extends BaseController {
 
     @Resource
     private AccountExpenseService accountExpenseService;
@@ -41,11 +42,11 @@
      */
     @PostMapping("/add")
     @Operation(summary = "鏂板")
-    public AjaxResult add(@RequestBody AccountExpense accountExpense) {
+    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));
     }
 
     /**
@@ -55,12 +56,12 @@
      */
     @DeleteMapping("/del")
     @Operation(summary = "鍒犻櫎")
-    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+    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));
     }
 
     /**
@@ -70,8 +71,8 @@
      */
     @PostMapping("/update")
     @Operation(summary = "淇敼")
-    public AjaxResult update(@RequestBody AccountExpense accountExpense) {
-        return AjaxResult.success(accountExpenseService.updateById(accountExpense));
+    public R<?> update(@RequestBody AccountExpense accountExpense) {
+        return R.ok(accountExpenseService.updateById(accountExpense));
     }
 
     /**
@@ -82,8 +83,8 @@
      */
     @GetMapping("/listPage")
     @Operation(summary = "鍒嗛〉鏌ヨ")
-    public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
-        return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
+    public R<?> accountExpenseListPage(Page page, AccountExpense accountExpense) {
+        return R.ok(accountExpenseService.accountExpenseListPage(page, accountExpense));
     }
 
     /**
@@ -93,8 +94,8 @@
      */
     @GetMapping("/{id}")
     @Operation(summary = "璇︽儏")
-    public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(accountExpenseService.getById(id));
+    public R<?> accountExpenseDetail(@PathVariable("id") Integer id) {
+        return R.ok(accountExpenseService.getById(id));
     }
 
     /**
@@ -115,8 +116,8 @@
      */
     @GetMapping("/report/forms")
     @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
-    public AjaxResult report(DateQueryDto dateQueryDto) {
-        return AjaxResult.success(accountExpenseService.report(dateQueryDto));
+    public R<?> report(DateQueryDto dateQueryDto) {
+        return R.ok(accountExpenseService.report(dateQueryDto));
     }
 
     /**
@@ -125,8 +126,8 @@
      */
     @GetMapping("/report/analysis")
     @Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
-    public AjaxResult analysis() {
-        return AjaxResult.success(accountExpenseService.analysis());
+    public R<?> analysis() {
+        return R.ok(accountExpenseService.analysis());
     }
 
     /**
@@ -136,8 +137,8 @@
      */
     @GetMapping("/report/income")
     @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
-    public AjaxResult reportIncome(ReportDateDto reportDateDto) {
-        return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
+    public R<?> reportIncome(ReportDateDto reportDateDto) {
+        return R.ok(accountIncomeService.reportIncome(reportDateDto));
     }
 
     /**
@@ -147,8 +148,8 @@
      */
     @GetMapping("/report/expense")
     @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
-    public AjaxResult reportExpense(ReportDateDto reportDateDto) {
-        return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
+    public R<?> reportExpense(ReportDateDto reportDateDto) {
+        return R.ok(accountExpenseService.reportExpense(reportDateDto));
     }
 
 

--
Gitblit v1.9.3