From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 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 cccad8d..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,11 +3,15 @@
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.core.utils.DateUtil;
import com.doumee.dao.business.model.Solutions;
+import com.doumee.dao.system.vo.BigDecimalVO;
import com.doumee.service.business.SolutionsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,7 +20,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -95,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) {
@@ -122,4 +145,25 @@
return ApiResponse.success(solutionsService.findById(id));
}
+
+
+ @ApiOperation("testSolutionAddMoney")
+ @GetMapping("/testSolutionAddMoney")
+ public ApiResponse<BigDecimal> testSolutionAddMoney (Integer id, BigDecimal fee, String start, String end, String newDate, String newEndDate) {
+ return ApiResponse.success(solutionsService.testSolutionAddMoney(id,fee, DateUtil.StringToDate(start),DateUtil.StringToDate(end)
+ ,DateUtil.StringToDate(newDate),DateUtil.StringToDate(newEndDate)));
+ }
+
+ @ApiOperation("testSolutionReduceMoney")
+ @GetMapping("/testSolutionReduceMoney")
+ public ApiResponse<BigDecimal> testSolutionReduceMoney (Integer id, BigDecimal fee, String start, String end, String reduceStartTime,String reduceEndTime) {
+ return ApiResponse.success(solutionsService.testSolutionReduceMoney(id,fee, DateUtil.StringToDate(start),DateUtil.StringToDate(end) ,DateUtil.StringToDate(reduceStartTime),DateUtil.StringToDate(reduceEndTime)));
+ }
+
+ @ApiOperation("testSolutionProduceMoney")
+ @GetMapping("/testSolutionProduceMoney")
+ public ApiResponse<BigDecimal> testSolutionProduceMoney (Integer id, BigDecimal fee, String start, String end,String produceStart) {
+ return ApiResponse.success(solutionsService.testSolutionProduceMoney(id,fee, DateUtil.StringToDate(start),DateUtil.StringToDate(end),DateUtil.StringToDate(produceStart)));
+ }
+
}
--
Gitblit v1.9.3