From 644dea17d0f553bdd36f5bd3a6f3a946f5e033e2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
index 26228ba..b9d12c4 100644
--- a/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/SolutionsController.java
@@ -46,6 +46,14 @@
return ApiResponse.success(null);
}
+ @ApiOperation("绂佺敤鍚敤")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:solutions:update")
+ public ApiResponse updateStatus(@RequestBody Solutions solutions) {
+ solutionsService.updateStatus(solutions);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@RequiresPermissions("business:solutions:delete")
@@ -77,15 +85,15 @@
@ApiOperation("鍒楄〃鏌ヨ")
@PostMapping("/list")
@RequiresPermissions("business:solutions:query")
- public ApiResponse<List<Solutions>> findList (@RequestBody Solutions pageWrap) {
- return ApiResponse.success(solutionsService.findList(pageWrap));
+ public ApiResponse<List<Solutions>> findList () {
+ return ApiResponse.success(solutionsService.findListForCompany());
}
- @ApiOperation("鍒楄〃鏌ヨ")
- @PostMapping("/page")
- public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
- return ApiResponse.success(solutionsService.findList(solutions));
- }
+// @ApiOperation("鍒楄〃鏌ヨ")
+// @PostMapping("/page")
+// public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+// return ApiResponse.success(solutionsService.findList(solutions));
+// }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
--
Gitblit v1.9.3