From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 6256cca..e0c12bf 100644
--- a/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -6,7 +6,12 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.CountCyclePriceDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
 import com.doumee.dao.business.model.ApplyChange;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
 import com.doumee.service.business.ApplyChangeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +25,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Api(tags = "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
 @RestController
@@ -71,7 +76,7 @@
     @PostMapping("/page")
     @RequiresPermissions("business:applychange:query")
     public ApiResponse<PageData<ApplyChange>> findPage (@RequestBody PageWrap<ApplyChange> pageWrap) {
-        return ApiResponse.success(applyChangeService.findPage(pageWrap));
+        return ApiResponse.success(applyChangeService.findPageForCompany(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
@@ -80,11 +85,50 @@
     public void exportExcel (@RequestBody PageWrap<ApplyChange> pageWrap, HttpServletResponse response) {
         ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃", response);
     }
+    @ApiOperation("瀵煎嚭鍔犲噺淇濊鎯呭崟")
+    @PostMapping("/exportJiajianBaoExcel")
+    @RequiresPermissions("business:applychange:exportExcel")
+    public void exportJiajianBaoExcel (@RequestBody ApplyChange model, HttpServletResponse response) {
+        ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcel(applyChangeService.exportJiajianBaoExcel(model),   response);
+    }
+    @ApiOperation("瀵煎嚭鎹㈠巶鐢宠璇︽儏鍗�")
+    @PostMapping("/exportChangeUnitExcel")
+    @RequiresPermissions("business:applychange:exportExcel")
+    public void exportChangeUnitExcel (@RequestBody ApplyChange model, HttpServletResponse response) {
+        ExcelExporter.build(ApplyChange.class).exportChangeUnitExcel(applyChangeService.exportChangeUnitExcel(model),   response);
+    }
+    @ApiOperation("鑾峰彇鍔犲噺淇濈绔犲湴鍧�")
+    @PostMapping("/getJiajianBaoSignLink")
+    @RequiresPermissions("business:applychange:sign")
+    public ApiResponse<String> getSignLinkJiajiabao (@RequestBody ApplyChange model, HttpServletResponse response) {
+        return ApiResponse.success( applyChangeService.getSignLinkJiajiabao(model));
+    }
+    @ApiOperation("鑾峰彇缂撳瓨鐢宠绛剧珷鍦板潃")
+    @PostMapping("/getChangeUnitSignLink")
+    @RequiresPermissions("business:applychange:sign")
+    public ApiResponse<String> getChangeUnitSignLink (@RequestBody ApplyChange model, HttpServletResponse response) {
+        return ApiResponse.success( applyChangeService.getSignLinkChangeUnit(model));
+    }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:applychange:query")
     public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(applyChangeService.findById(id));
+        return ApiResponse.success(applyChangeService.findDetail(id));
     }
+
+
+    @ApiOperation(value = "涓氬姟澶勭悊",notes = "閫�鍥炵敵璇凤紝鍏抽棴绛�")
+    @PostMapping("/applyChangeOpt")
+    public ApiResponse applyChangeOpt (@RequestBody ApplyChangeOptDTO applyChangeOptDTO) {
+        applyChangeService.changeOpt(applyChangeOptDTO);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+    @ApiOperation("鍔犲噺淇濅笟鍔¤ˉ鍏呴噾棰�")
+    @PostMapping("/getChangeCountCyclePriceVO")
+    public ApiResponse<CountCyclePriceVO> getChangeCountCyclePriceVO (@RequestBody ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO) {
+        return ApiResponse.success("鎿嶄綔鎴愬姛",applyChangeService.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO));
+    }
+
 }

--
Gitblit v1.9.3