From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
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