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/InsuranceApplyController.java |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 944a8df..2d0296e 100644
--- a/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -6,11 +6,16 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.CountCyclePriceDTO;
+import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
+import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
 import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
 import com.doumee.service.business.InsuranceApplyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
+import io.swagger.models.auth.In;
+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 +25,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Api(tags = "鎶曚繚鐢宠淇℃伅琛�")
 @RestController
@@ -36,6 +41,14 @@
     @RequiresPermissions("business:insuranceapply:create")
     public ApiResponse create(@RequestBody InsuranceApply insuranceApply) {
         return ApiResponse.success(insuranceApplyService.create(insuranceApply));
+    }
+
+    @PreventRepeat
+    @ApiOperation("淇敼")
+    @PostMapping("/updateData")
+    @RequiresPermissions("business:insuranceapply:create")
+    public ApiResponse updateData(@RequestBody InsuranceApply insuranceApply) {
+        return ApiResponse.success(insuranceApplyService.updateData(insuranceApply));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -70,21 +83,71 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:insuranceapply:query")
-    public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApply> pageWrap) {
+    public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
         return ApiResponse.success(insuranceApplyService.findPage(pageWrap));
+    }
+
+    @ApiOperation("鍒楄〃")
+    @PostMapping("/findListByDTO")
+    @RequiresPermissions("business:insuranceapply:query")
+    public ApiResponse<List<InsuranceApply>> findListByDTO (@RequestBody InsuranceApplyQueryDTO insuranceApplyQueryDTO) {
+        return ApiResponse.success(insuranceApplyService.findListByDTO(insuranceApplyQueryDTO));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:insuranceapply:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<InsuranceApply> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap, HttpServletResponse response) {
         ExcelExporter.build(InsuranceApply.class).export(insuranceApplyService.findPage(pageWrap).getRecords(), "鎶曚繚鐢宠淇℃伅琛�", response);
     }
 
+    @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+    @PostMapping("/exportDetailExcel")
+    @RequiresPermissions("business:insuranceapply:exportExcel")
+    public void exportDetailExcel (@RequestBody  InsuranceApply model, HttpServletResponse response) {
+        ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApplyService.findDetailForExport(model),  response);
+    }
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @RequiresPermissions("business:insuranceapply:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(insuranceApplyService.findById(id));
+    public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
+        return ApiResponse.success(insuranceApplyService.findDetail(id));
     }
+    @ApiOperation("浼佷笟绛剧讲淇濆崟")
+    @GetMapping("/getSignLink/{id}")
+    @RequiresPermissions("business:insuranceapply:query")
+    public ApiResponse<String> getSignLink(@PathVariable Integer id) {
+        return ApiResponse.success(insuranceApplyService.getSignLink(id));
+    }
+
+
+    @ApiOperation("鐢宠璁板綍鐘舵�佸鐞�")
+    @PostMapping("/applyOpt")
+    public ApiResponse applyOpt (@RequestBody InsuranceApplyOptDTO insuranceApplyOptDTO) {
+        insuranceApplyService.applyOpt(insuranceApplyOptDTO);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+    @ApiOperation("鑾峰彇淇濆崟姝㈡湡涓庡垵濮嬮噾棰�")
+    @PostMapping("/getCountCyclePriceVO")
+    public ApiResponse<CountCyclePriceVO> getCountCyclePriceVO (@RequestBody CountCyclePriceDTO countCyclePriceDTO) {
+        return ApiResponse.success("鎿嶄綔鎴愬姛",insuranceApplyService.getCountCyclePriceVO(countCyclePriceDTO));
+    }
+
+
+    @ApiOperation("娴嬭瘯瀹為檯閲戦")
+    @GetMapping("/testFee")
+    public ApiResponse testFee(Integer id) {
+        insuranceApplyService.updateApplyCurrentFee(id);
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("娴嬭瘯鐢熸垚寰呯画淇濋�氱煡")
+    @GetMapping("/generateNotice")
+    public ApiResponse generateNotice() {
+        insuranceApplyService.generateNotice();
+        return ApiResponse.success(null);
+    }
+
 }

--
Gitblit v1.9.3