From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 六月 2025 10:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/SolutionsController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/SolutionsController.java b/server/shop/src/main/java/com/doumee/api/business/SolutionsController.java
index 2549513..6c10bce 100644
--- a/server/shop/src/main/java/com/doumee/api/business/SolutionsController.java
+++ b/server/shop/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.PageData;
import com.doumee.core.model.PageWrap;
+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 javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -102,4 +106,18 @@
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