From deb3baf0fb04c3a9f5b0d4b5bd9fb3237908d576 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 二月 2024 18:38:12 +0800 Subject: [PATCH] 111 --- server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 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 b9d12c4..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,6 +18,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author 姹熻箘韫� @@ -85,10 +87,21 @@ @ApiOperation("鍒楄〃鏌ヨ") @PostMapping("/list") @RequiresPermissions("business:solutions:query") - public ApiResponse<List<Solutions>> findList () { - return ApiResponse.success(solutionsService.findListForCompany()); + 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) { -- Gitblit v1.9.3