From ee8b99a512bac9de3c88ad19b2c674c3d8c7655f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 六月 2025 10:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 666e71b..fce85f8 100644
--- a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -4,6 +4,7 @@
 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.dao.business.dto.ApplyPowerDTO;
@@ -13,11 +14,16 @@
 import com.doumee.dao.business.model.InsuranceApply;
 import com.doumee.dao.business.vo.ApplyPowerVO;
 import com.doumee.dao.business.vo.CountCyclePriceVO;
+import com.doumee.dao.business.vo.dataBoard.DataListVO;
+import com.doumee.dao.business.vo.dataBoard.InsuranceApplyDataVO;
+import com.doumee.dao.business.vo.dataBoard.InsuranceApplyReportDataVO;
+import com.doumee.service.business.InsuranceApplyOnService;
 import com.doumee.service.business.InsuranceApplyService;
 import com.doumee.service.business.impl.UnionApplyServiceImpl;
 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;
@@ -36,6 +42,8 @@
 
     @Autowired
     private InsuranceApplyService insuranceApplyService;
+    @Autowired
+    private InsuranceApplyOnService insuranceApplyOnService;
 
     @Autowired
     private UnionApplyServiceImpl unionApplyServiceImpl;
@@ -66,13 +74,13 @@
     @PostMapping("/back")
     @RequiresPermissions("business:insuranceapply:back")
     public ApiResponse back(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.back(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.back(insuranceApply));
     }
     @ApiOperation("骞冲彴涓婁紶鎶曚繚鍗�")
     @PostMapping("/uploadToubaodan")
     @RequiresPermissions("business:insuranceapply:uploadToubaodan")
     public ApiResponse uploadToubaodan(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.uploadToubaodan(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.uploadToubaodan(insuranceApply));
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,13 +95,13 @@
     @PostMapping("/uploadBaoxiandan")
     @RequiresPermissions("business:insuranceapply:uploadBaoxiandan")
     public ApiResponse uploadBaoxiandan(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.uploadBaoxiandan(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.uploadBaoxiandan(insuranceApply));
     }
     @ApiOperation("骞冲彴澶勭悊閫�鍗曠敵璇�")
     @PostMapping("/dealBackApply")
     @RequiresPermissions("business:insuranceapply:dealBackApply")
     public ApiResponse dealBackApply(@RequestBody InsuranceApply insuranceApply) {
-        return ApiResponse.success(insuranceApplyService.dealBackApply(insuranceApply));
+        return ApiResponse.success(insuranceApplyOnService.dealBackApply(insuranceApply));
     }
     @ApiOperation("骞冲彴淇敼淇濋櫓鍗�")
     @PostMapping("/editBaoxiandan")
@@ -184,4 +192,38 @@
         insuranceApplyService.testSendEmail();
         return ApiResponse.success(null);
     }
+
+    @ApiOperation("鎶曚繚鍒嗘瀽鎶ヨ〃鏁版嵁")
+    @GetMapping("/getInsuranceApplyReportDataVO")
+    public ApiResponse<InsuranceApplyReportDataVO> getInsuranceApplyReportDataVO() {
+        return ApiResponse.success(insuranceApplyOnService.getInsuranceApplyReportDataVO());
+    }
+
+
+    @ApiOperation("鎶曚繚鍒嗘瀽鏁版嵁")
+    @GetMapping("/getInsuranceApplyDataVO")
+    public ApiResponse<InsuranceApplyDataVO> getInsuranceApplyDataVO() {
+        return ApiResponse.success(insuranceApplyOnService.getInsuranceApplyDataVO());
+    }
+
+    @ApiOperation("姣忔湀鍔犲噺淇濅汉鏁�")
+    @GetMapping("/getAddReduceData")
+    public ApiResponse<List<DataListVO>> getAddReduceData() {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        return ApiResponse.success(insuranceApplyOnService.getAddReduceData(loginUserInfo));
+    }
+    @ApiOperation("宸叉姇淇濆崟鏁版嵁")
+    @GetMapping("/getInsuranceNum")
+    public ApiResponse<InsuranceApplyDataVO> getInsuranceNum() {
+        return ApiResponse.success(insuranceApplyOnService.getInsuranceNum());
+    }
+
+    @ApiOperation("姣忔湀璧斾粯閲戦")
+    @GetMapping("/getSettleClaimsMoney")
+    public ApiResponse<List<DataListVO>> getSettleClaimsMoney() {
+        return ApiResponse.success(insuranceApplyOnService.getSettleClaimsMoney());
+    }
+
+
+
 }

--
Gitblit v1.9.3