From 2d528d024b179b6b06d1d2702e72f6caa5f67149 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:45:30 +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 | 16 ++--------------
1 files changed, 2 insertions(+), 14 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 d349490..6850e74 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
@@ -88,11 +88,6 @@
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
PageData<InsuranceApply> pageData = insuranceApplyService.findPage(pageWrap);
- pageData.getRecords().forEach(i->{
- if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- i.setFee(null);
- }
- });
return ApiResponse.success(pageData);
}
@@ -115,10 +110,6 @@
@RequiresPermissions("business:insuranceapply:exportExcel")
public void exportDetailExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
InsuranceApply insuranceApply = insuranceApplyService.findDetailForExport(model);
- if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)
- &&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- insuranceApply.setFee(null);
- }
ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApply, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -126,9 +117,6 @@
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
InsuranceApply insuranceApply = insuranceApplyService.findDetail(id);
- if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)&&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
- insuranceApply.setFee(null);
- }
return ApiResponse.success(insuranceApply);
}
@ApiOperation("浼佷笟绛剧讲淇濆崟")
@@ -162,8 +150,8 @@
@ApiOperation("娴嬭瘯瀹為檯閲戦")
@GetMapping("/testFee")
- public ApiResponse testFee(Integer id) {
- insuranceApplyService.updateApplyCurrentFee(id);
+ public ApiResponse testFee(Integer id,Integer unionId) {
+ insuranceApplyService.updateApplyCurrentFee(id, unionId);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3