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/SolutionsController.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java b/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java index 6232731..d4d001f 100644 --- a/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java +++ b/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java @@ -3,9 +3,12 @@ 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; +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,6 +20,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author 姹熻箘韫� @@ -102,4 +106,20 @@ public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(solutionsService.findById(id)); } + + @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); + } + + } -- Gitblit v1.9.3