From ade22c0c65473ab6b56ca2bd0dd2c77014eb1f13 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 14:35:41 +0800
Subject: [PATCH] git ch
---
server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 8e08602..cccad8d 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
@@ -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.core.utils.Constants;
import com.doumee.dao.business.model.Solutions;
import com.doumee.service.business.SolutionsService;
import io.swagger.annotations.Api;
@@ -17,12 +18,13 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
-@Api(tags = "淇濋櫓鏂规淇℃伅琛紙鍘嗗彶鐗堟湰锛�")
+@Api(tags = "淇濋櫓鏂规淇℃伅琛�")
@RestController
@RequestMapping("/business/solutions")
public class SolutionsController extends BaseController {
@@ -43,6 +45,14 @@
@RequiresPermissions("business:solutions:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
solutionsService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("绂佺敤鍚敤")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:solutions:update")
+ public ApiResponse updateStatus(@RequestBody Solutions solutions) {
+ solutionsService.updateStatus(solutions);
return ApiResponse.success(null);
}
@@ -67,18 +77,42 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("銆愬钩鍙扮銆戝垎椤垫煡璇�")
@PostMapping("/page")
@RequiresPermissions("business:solutions:query")
public ApiResponse<PageData<Solutions>> findPage (@RequestBody PageWrap<Solutions> pageWrap) {
return ApiResponse.success(solutionsService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/list")
+ @RequiresPermissions("business:solutions:query")
+ public ApiResponse<List<Solutions>> findList (Solutions solutions) {
+ Integer dateType = Constants.TWO;
+ if(!Objects.isNull(solutions)&&!Objects.isNull(solutions.getDataType())){
+ dateType = solutions.getDataType();
+ }
+ return ApiResponse.success(solutionsService.findListForCompany(dateType));
+ }
+
+ @ApiOperation("鏍规嵁鍘嗗彶鐗堟湰鏌ヨ褰撳墠鏈�鏂板惎鐢ㄧ増鏈�")
+ @GetMapping("/getNewVersion")
+ public ApiResponse<Solutions> getNewVersion (@RequestParam Integer solutionId) {
+ return ApiResponse.success(solutionsService.getNewVersion(solutionId));
+ }
+
+
+// @ApiOperation("鍒楄〃鏌ヨ")
+// @PostMapping("/page")
+// public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+// return ApiResponse.success(solutionsService.findList(solutions));
+// }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:solutions:exportExcel")
public void exportExcel (@RequestBody PageWrap<Solutions> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Solutions.class).export(solutionsService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛紙鍘嗗彶鐗堟湰锛�", response);
+ ExcelExporter.build(Solutions.class).export(solutionsService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,4 +121,5 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(solutionsService.findById(id));
}
+
}
--
Gitblit v1.9.3