From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 807f9ee..b0d569d 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,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -85,7 +87,13 @@
@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);
+ 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);
}
@ApiOperation("鍒楄〃")
@@ -106,13 +114,22 @@
@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);
+ 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鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:insuranceapply:query")
public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
- return ApiResponse.success(insuranceApplyService.findDetail(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("浼佷笟绛剧讲淇濆崟")
@GetMapping("/getSignLink/{id}")
@@ -145,8 +162,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