From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
index a572288..03151e4 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.java
@@ -6,6 +6,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.Solutions;
 import com.doumee.dao.business.model.SolutionsBase;
 import com.doumee.service.business.SolutionsBaseService;
 import io.swagger.annotations.Api;
@@ -20,9 +21,9 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/10/28 19:16
  */
-@Api(tags = "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
+@Api(tags = "淇濋櫓鏂规淇℃伅琛�")
 @RestController
 @RequestMapping("/business/solutionsBase")
 public class SolutionsBaseController extends BaseController {
@@ -67,6 +68,16 @@
         return ApiResponse.success(null);
     }
 
+
+    @ApiOperation("绂佺敤鍚敤")
+    @PostMapping("/updateStatus")
+    @RequiresPermissions("business:solutionsbase:update")
+    public ApiResponse updateStatus(@RequestBody SolutionsBase bean) {
+        solutionsBaseService.updateStatus(bean);
+        return ApiResponse.success(null);
+    }
+
+
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:solutionsbase:query")
@@ -74,11 +85,19 @@
         return ApiResponse.success(solutionsBaseService.findPage(pageWrap));
     }
 
+
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @RequiresPermissions("business:solutionsbase:query")
+    public ApiResponse<List<SolutionsBase>> list (@RequestBody SolutionsBase solutionsBase) {
+        return ApiResponse.success(solutionsBaseService.findList(solutionsBase));
+    }
+
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:solutionsbase:exportExcel")
     public void exportExcel (@RequestBody PageWrap<SolutionsBase> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�", response);
+        ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")

--
Gitblit v1.9.3