From c1b5d8b81d63555f6f0095aa823f07d99f80fe21 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 18:22:49 +0800
Subject: [PATCH] git ch

---
 server/company/src/main/java/com/doumee/api/business/SolutionsController.java |   78 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 6 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 492c4e0..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,10 +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;
@@ -15,8 +20,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 姹熻箘韫�
@@ -43,6 +51,14 @@
     @RequiresPermissions("business:solutions:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
         solutionsService.deleteById(id);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("绂佺敤鍚敤")
+    @PostMapping("/updateStatus")
+    @RequiresPermissions("business:solutions:update")
+    public ApiResponse updateStatus(@RequestBody Solutions solutions) {
+        solutionsService.updateStatus(solutions);
         return ApiResponse.success(null);
     }
 
@@ -77,15 +93,43 @@
     @ApiOperation("鍒楄〃鏌ヨ")
     @PostMapping("/list")
     @RequiresPermissions("business:solutions:query")
-    public ApiResponse<List<Solutions>> findList (@RequestBody Solutions pageWrap) {
-        return ApiResponse.success(solutionsService.findList(pageWrap));
+    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("鍒楄〃鏌ヨ")
-    @PostMapping("/page")
-    public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
-        return ApiResponse.success(solutionsService.findList(solutions));
+
+    @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) {
+        return ApiResponse.success(solutionsService.getNewVersion(solutionId));
+    }
+
+
+//    @ApiOperation("鍒楄〃鏌ヨ")
+//    @PostMapping("/page")
+//    public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {
+//        return ApiResponse.success(solutionsService.findList(solutions));
+//    }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
@@ -100,4 +144,26 @@
     public ApiResponse findById(@PathVariable Integer id) {
         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