Commit 561331ad authored by 查济's avatar 查济

Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!237
parents 38ca65ef 7418d54a
...@@ -5597,6 +5597,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5597,6 +5597,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
BeanCopyUtils.copyProperties(tInsuranceDetail,param); BeanCopyUtils.copyProperties(tInsuranceDetail,param);
param.setDetailId(tInsuranceDetail.getId()); param.setDetailId(tInsuranceDetail.getId());
Integer settleType = tInsuranceDetail.getSettleType(); Integer settleType = tInsuranceDetail.getSettleType();
BigDecimal actualPremium = tInsuranceDetail.getActualPremium();
BigDecimal estimatePremium = tInsuranceDetail.getEstimatePremium();
if(CommonConstants.ZERO_INT == settleType){ if(CommonConstants.ZERO_INT == settleType){
param.setEstimateStatus(EkpConstants.HAVE); param.setEstimateStatus(EkpConstants.HAVE);
}else { }else {
...@@ -5629,8 +5631,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5629,8 +5631,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
String defaultSettleId = tInsuranceDetail.getDefaultSettleId(); String defaultSettleId = tInsuranceDetail.getDefaultSettleId();
TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId); TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
//冲正取负数 //冲正取负数
if(null != byId.getEstimatePremium()){ if(null != estimatePremium){
param.setEstimatePremium(byId.getEstimatePremium().negate()); param.setEstimatePremium(estimatePremium);
} }
param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL); param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
...@@ -5641,8 +5643,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5641,8 +5643,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
String defaultSettleId = tInsuranceDetail.getDefaultSettleId(); String defaultSettleId = tInsuranceDetail.getDefaultSettleId();
TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId); TInsuranceSettle byId = tInsuranceSettleService.getById(defaultSettleId);
//冲正取负数 //冲正取负数
if(null != byId.getActualPremium()){ if(null != estimatePremium){
param.setActualPremium(byId.getActualPremium().negate()); param.setActualPremium(actualPremium);
} }
param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL); param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment