From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +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/AccountIncomeController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 68e50f7..8db2730 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -14,11 +14,13 @@
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 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;
@@ -27,6 +29,7 @@
*/
@RestController
@RequestMapping("/account/accountIncome")
+@Api(tags = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
public class AccountIncomeController {
@Resource
@@ -39,6 +42,7 @@
* @return
*/
@PostMapping("/add")
+ @ApiOperation("鏂板")
public AjaxResult add(@RequestBody AccountIncome accountIncome) {
accountIncome.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -52,6 +56,7 @@
* @return
*/
@DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -66,6 +71,7 @@
* @return
*/
@PostMapping("/update")
+ @ApiOperation("淇敼")
public AjaxResult update(@RequestBody AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.updateById(accountIncome));
}
@@ -77,6 +83,7 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
@@ -87,6 +94,7 @@
* @return
*/
@GetMapping("/{id}")
+ @ApiOperation("璇︽儏")
public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(accountIncomeService.getById(id));
}
@@ -97,6 +105,7 @@
* @param accountIncome
*/
@PostMapping("/export")
+ @ApiOperation("瀵煎嚭")
public void accountIncomeExport(HttpServletResponse response,AccountIncome accountIncome) {
accountIncomeService.accountIncomeExport(response, accountIncome);
}
--
Gitblit v1.9.3