From a22fa65d1027f8500c0494e97ff2232f70e9ca93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:27:06 +0800
Subject: [PATCH] 提交一把
---
server/company/src/main/java/com/doumee/api/business/SolutionsController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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..56f85a2 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,7 +6,10 @@
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;
@@ -15,8 +18,11 @@
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;
/**
* @author 姹熻箘韫�
@@ -85,9 +91,20 @@
@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")
@@ -109,4 +126,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