From 3ff2a2c1789d692a64a43e9f7e70ca5b3578b0a8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:01:22 +0800
Subject: [PATCH] feat(home): 添加生产看板功能并优化订单查询性能

---
 src/main/java/com/ruoyi/account/controller/AccountIncomeController.java |   57 +++++++++++++++++++++++++--------------------------------
 1 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index c6a24d7..6d31342 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -1,26 +1,19 @@
 package com.ruoyi.account.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountFileService;
 import com.ruoyi.account.service.AccountIncomeService;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.quality.pojo.QualityInspectFile;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.service.IQualityInspectFileService;
-import com.ruoyi.quality.service.IQualityInspectParamService;
-import com.ruoyi.quality.service.IQualityInspectService;
-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 org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -29,8 +22,8 @@
  */
 @RestController
 @RequestMapping("/account/accountIncome")
-@Api(tags = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
-public class AccountIncomeController {
+@Tag(name = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
+public class AccountIncomeController extends BaseController {
 
     @Resource
     private AccountIncomeService accountIncomeService;
@@ -42,12 +35,12 @@
      * @return
      */
     @PostMapping("/add")
-    @ApiOperation("鏂板")
-    public AjaxResult add(@RequestBody AccountIncome accountIncome) {
+    @Operation(summary = "鏂板")
+    public R<?> add(@RequestBody AccountIncome accountIncome) {
         accountIncome.setInputTime(new Date());
         LoginUser loginUser = SecurityUtils.getLoginUser();
         accountIncome.setInputUser(loginUser.getNickName());
-        return AjaxResult.success(accountIncomeService.save(accountIncome));
+        return R.ok(accountIncomeService.save(accountIncome));
     }
 
     /**
@@ -56,13 +49,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(accountIncomeService.removeBatchByIds(ids));
+        return R.ok(accountIncomeService.removeBatchByIds(ids));
     }
 
     /**
@@ -71,9 +64,9 @@
      * @return
      */
     @PostMapping("/update")
-    @ApiOperation("淇敼")
-    public AjaxResult update(@RequestBody AccountIncome accountIncome) {
-        return AjaxResult.success(accountIncomeService.updateById(accountIncome));
+    @Operation(summary = "淇敼")
+    public R<?> update(@RequestBody AccountIncome accountIncome) {
+        return R.ok(accountIncomeService.updateById(accountIncome));
     }
 
     /**
@@ -83,9 +76,9 @@
      * @return
      */
     @GetMapping("/listPage")
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
-        return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
+    @Operation(summary = "鍒嗛〉鏌ヨ")
+    public R<?> accountIncomeListPage(Page page, AccountIncome accountIncome) {
+        return R.ok(accountIncomeService.accountIncomeListPage(page, accountIncome));
     }
 
     /**
@@ -94,9 +87,9 @@
      * @return
      */
     @GetMapping("/{id}")
-    @ApiOperation("璇︽儏")
-    public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
-        return AjaxResult.success(accountIncomeService.getById(id));
+    @Operation(summary = "璇︽儏")
+    public R<?> accountIncomeDetail(@PathVariable("id") Integer id) {
+        return R.ok(accountIncomeService.getById(id));
     }
 
     /**
@@ -105,7 +98,7 @@
      * @param accountIncome
      */
     @PostMapping("/export")
-    @ApiOperation("瀵煎嚭")
+    @Operation(summary = "瀵煎嚭")
     public void accountIncomeExport(HttpServletResponse response,AccountIncome accountIncome) {
         accountIncomeService.accountIncomeExport(response, accountIncome);
     }

--
Gitblit v1.9.3