From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/company/src/main/java/com/doumee/api/business/ApplyChangeController.java |   64 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 9 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..2debb6c 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
@@ -4,13 +4,21 @@
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+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;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +28,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Api(tags = "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃")
 @RestController
@@ -59,11 +67,11 @@
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
+    @ApiOperation("淇敼淇℃伅")
+    @PostMapping("/update")
     @RequiresPermissions("business:applychange:update")
-    public ApiResponse updateById(@RequestBody ApplyChange applyChange) {
-        applyChangeService.updateById(applyChange);
+    public ApiResponse update(@RequestBody ApplyChange applyChange) {
+        applyChangeService.update(applyChange);
         return ApiResponse.success(null);
     }
 
@@ -71,20 +79,58 @@
     @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")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:applychange:exportExcel")
     public void exportExcel (@RequestBody PageWrap<ApplyChange> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傜敵璇蜂俊鎭〃", response);
+        ExcelExporter.build(ApplyChange.class).export(applyChangeService.findPageForCompany(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