|
@@ -337,12 +337,19 @@ public class InsuranceApplicationController {
|
|
|
|
|
|
acceptInsuranceDTO.setInsuranceDefLimitList(insuranceDefinitionLimits);
|
|
|
|
|
|
-// if(insuranceApplication.getInsuranceFee()!=null){
|
|
|
-// acceptInsuranceDTO.setTotalAmount(insuranceApplication.getInsuranceFee());
|
|
|
-// }
|
|
|
-// else {
|
|
|
+ Integer status = 0;
|
|
|
+
|
|
|
+ if (StringUtils.isNotEmpty(insuranceApplication.getStatus())) {
|
|
|
+ status = Integer.valueOf(insuranceApplication.getStatus());
|
|
|
+ }
|
|
|
+
|
|
|
+ //已提交后则显示为数据库中保存金额
|
|
|
+ if(status>=PolicyStatus.PendingTrial.getValue() && insuranceApplication.getInsuranceFee()!=null){
|
|
|
+ acceptInsuranceDTO.setTotalAmount(insuranceApplication.getInsuranceFee());
|
|
|
+ }
|
|
|
+ else {
|
|
|
acceptInsuranceDTO.setTotalAmount(totalAmount);
|
|
|
-// }
|
|
|
+ }
|
|
|
|
|
|
msgResult.setData(acceptInsuranceDTO);
|
|
|
msgResult.setResult(true);
|