From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 4caeb81..88d918f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1822,7 +1822,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
}
applyDetail.setPrice(
- applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
+ applyDetail.getFee().divide(new BigDecimal(maxDays),7,RoundingMode.HALF_UP)
);
//楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
@@ -1894,18 +1894,21 @@
return new ArrayList<>();
}
List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
- if(collectStatus.equals(Constants.ApplyCollectStatus.DCD.getKey())){
+ if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DCD.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DSP.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.BZZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YTH.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGB.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DQYQZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGQ.getKey())){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
+ statusList.add(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
}
return statusList;
--
Gitblit v1.9.3