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/AccountIncomeController.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 690e75a..6d31342 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -1,19 +1,12 @@
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 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;
@@ -30,7 +23,7 @@
@RestController
@RequestMapping("/account/accountIncome")
@Tag(name = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
-public class AccountIncomeController {
+public class AccountIncomeController extends BaseController {
@Resource
private AccountIncomeService accountIncomeService;
@@ -43,11 +36,11 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody AccountIncome accountIncome) {
+ 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));
}
/**
@@ -57,12 +50,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(accountIncomeService.removeBatchByIds(ids));
+ return R.ok(accountIncomeService.removeBatchByIds(ids));
}
/**
@@ -72,8 +65,8 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody AccountIncome accountIncome) {
- return AjaxResult.success(accountIncomeService.updateById(accountIncome));
+ public R<?> update(@RequestBody AccountIncome accountIncome) {
+ return R.ok(accountIncomeService.updateById(accountIncome));
}
/**
@@ -84,8 +77,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
- return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
+ public R<?> accountIncomeListPage(Page page, AccountIncome accountIncome) {
+ return R.ok(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
/**
@@ -95,8 +88,8 @@
*/
@GetMapping("/{id}")
@Operation(summary = "璇︽儏")
- public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(accountIncomeService.getById(id));
+ public R<?> accountIncomeDetail(@PathVariable("id") Integer id) {
+ return R.ok(accountIncomeService.getById(id));
}
/**
--
Gitblit v1.9.3