From 870dfdba90fc4062b66de669ad9ff3f4707bf496 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 六月 2025 10:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 56b4cb2..0a19a5e 100644
--- a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -6,9 +6,15 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+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.model.InsuranceApply;
+import com.doumee.dao.business.vo.ApplyPowerVO;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
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;
@@ -18,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -31,6 +38,9 @@
@Autowired
private InsuranceApplyService insuranceApplyService;
+ @Autowired
+ private UnionApplyServiceImpl unionApplyServiceImpl;
+
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
@@ -42,14 +52,29 @@
@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));
}
+ @ApiOperation("鍒楄〃")
+ @PostMapping("/findListByDTO")
+ @RequiresPermissions("business:insuranceapply:query")
+ public ApiResponse<List<InsuranceApply>> findListByDTO (@RequestBody InsuranceApplyQueryDTO insuranceApplyQueryDTO) {
+ return ApiResponse.success(insuranceApplyService.findListByDTO(insuranceApplyQueryDTO));
+ }
+
@ApiOperation("鍟嗘埛鍏抽棴濮旀墭鎶曚繚")
@PostMapping("/closeWtbForShop")
@RequiresPermissions("business:insuranceapply:back")
@@ -123,7 +148,8 @@
@PostMapping("/page")
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
- return ApiResponse.success(insuranceApplyService.findPage(pageWrap));
+ PageData<InsuranceApply> pageData = insuranceApplyService.findPage(pageWrap);
+ return ApiResponse.success(pageData);
}
@ApiOperation("瀵煎嚭Excel")
@@ -136,7 +162,8 @@
@PostMapping("/exportDetailExcel")
@RequiresPermissions("business:insuranceapply:exportExcel")
public void exportDetailExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
- ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApplyService.findDetailForExport(model), response);
+ InsuranceApply insuranceApply = insuranceApplyService.findDetailForExport(model);
+ ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApply, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -145,4 +172,18 @@
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));
+ }
}
--
Gitblit v1.9.3