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 | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 104 insertions(+), 9 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 95e5981..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,15 +4,26 @@
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;
+import com.doumee.dao.business.dto.CountCyclePriceDTO;
import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
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;
@@ -31,6 +42,11 @@
@Autowired
private InsuranceApplyService insuranceApplyService;
+ @Autowired
+ private InsuranceApplyOnService insuranceApplyOnService;
+
+ @Autowired
+ private UnionApplyServiceImpl unionApplyServiceImpl;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -43,31 +59,49 @@
@PostMapping("/check")
@RequiresPermissions("business:insuranceapply:check")
public ApiResponse check(@RequestBody InsuranceApply insuranceApply) {
- return ApiResponse.success(insuranceApplyService.check(insuranceApply));
+ return ApiResponse.success(insuranceApplyService.check(insuranceApply,unionApplyServiceImpl));
}
- @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+
+ @ApiOperation("鎶曚繚澶嶅")
+ @PostMapping("/reexamineCheck")
+ @RequiresPermissions("business:insuranceapply:check")
+ public ApiResponse reexamineCheck(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.reexamineCheck(insuranceApply));
+ }
+
+
+ @ApiOperation("骞冲彴閫�鍥炵敵璇�")
@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鏌ヨ")
+ @GetMapping("/getSignLink/{id}")
+ @RequiresPermissions("business:insuranceapply:query")
+ public ApiResponse<String> getSignLink(@PathVariable Integer id) {
+ return ApiResponse.success(insuranceApplyService.getSignLink(id));
+ }
+
+
@ApiOperation("骞冲彴涓婁紶淇濋櫓鍗�")
@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")
@@ -121,14 +155,75 @@
@ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
@PostMapping("/exportDetailExcel")
@RequiresPermissions("business:insuranceapply:exportExcel")
- public void exportExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
+ public void exportDetailExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApplyService.findDetailForExport(model), response);
}
-
+ @ApiOperation("鍒楄〃")
+ @PostMapping("/findListByDTO")
+ @RequiresPermissions("business:insuranceapply:query")
+ public ApiResponse<List<InsuranceApply>> findListByDTO (@RequestBody InsuranceApplyQueryDTO insuranceApplyQueryDTO) {
+ return ApiResponse.success(insuranceApplyService.findListByDTO(insuranceApplyQueryDTO));
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
return ApiResponse.success(insuranceApplyService.findDetail(id));
}
+
+
+ @ApiOperation("鑾峰彇淇濆崟姝㈡湡涓庡垵濮嬮噾棰�")
+ @PostMapping("/getCountCyclePriceVO")
+ public ApiResponse<CountCyclePriceVO> getCountCyclePriceVO (@RequestBody CountCyclePriceDTO countCyclePriceDTO) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",insuranceApplyService.getCountCyclePriceVO(countCyclePriceDTO));
+ }
+
+
+ @ApiOperation("鏌ヨ淇濆崟鏄惁鍙繘琛屽姞鍑忎繚")
+ @PostMapping("/getApplyPower")
+ @RequiresPermissions("business:insuranceapply:query")
+ public ApiResponse<ApplyPowerVO> getApplyPower(@RequestBody ApplyPowerDTO applyPowerDTO) {
+ return ApiResponse.success(insuranceApplyService.getApplyPower(applyPowerDTO));
+ }
+
+ @ApiOperation("娴嬭瘯鍙戦�侀偖浠�")
+ @PostMapping("/testSendEmail")
+ public ApiResponse testSendEmail() {
+ 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