Commit ccb43d41 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents fc10247f fe36ac57
...@@ -6114,9 +6114,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6114,9 +6114,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail.setSourceType(CommonConstants.THREE_STRING); incomeDetail.setSourceType(CommonConstants.THREE_STRING);
R<TIncomeDetailReturnVo> detailList = socialDaprUtils.getTIncomeDetailList(incomeDetail); R<TIncomeDetailReturnVo> detailList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
if(Common.isNotNull(detailList) && detailList.getCode() == CommonConstants.SUCCESS if(Common.isNotNull(detailList) && detailList.getCode() == CommonConstants.SUCCESS
&& detailList.getData().getDetailList().size() > 0){ && !detailList.getData().getDetailList().isEmpty()){
incomeDetailList = detailList.getData().getDetailList(); incomeDetailList = detailList.getData().getDetailList();
isExist = true; BigDecimal sumMoney = BigDecimal.ZERO;
for (TIncomeDetail income : incomeDetailList) {
sumMoney = BigDecimalUtils.safeAdd(income.getMoney(), sumMoney);
if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
isExist = true;
}
}
} }
//预估或者实缴保费 //预估或者实缴保费
......
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