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/company/src/main/java/com/doumee/api/business/SolutionsController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 56f85a2..e3a0a0a 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
@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -99,6 +101,23 @@
return ApiResponse.success(solutionsService.findListForCompany(dateType));
}
+
+ @ApiOperation("鏌ヨ浼佷笟鍙娇鐢ㄦ柟妗堬紙宸茬缃诧級")
+ @GetMapping("/getUseList")
+ @RequiresPermissions("business:solutions:query")
+ public ApiResponse<List<Solutions>> getUseList (@RequestParam Integer companyId,Integer dateType) {
+ if(Objects.isNull(companyId)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(Objects.isNull(dateType)){
+ dateType = Constants.TWO;
+ }
+ List<Solutions> solutionsList = solutionsService.findListByCompanyId(dateType,companyId);
+ return ApiResponse.success(solutionsList);
+ }
+
+
+
@ApiOperation("鏍规嵁鍘嗗彶鐗堟湰鏌ヨ褰撳墠鏈�鏂板惎鐢ㄧ増鏈�")
@GetMapping("/getNewVersion")
public ApiResponse<Solutions> getNewVersion (@RequestParam Integer solutionId) {
--
Gitblit v1.9.3