修改

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -981,8 +981,17 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();//合同违约金
             BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();//名义价
             BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();//资方其他应收
-            BigDecimal all2 = bankContractLiquidated.add(bankNominalPrice).add(bankOtherReceivable);
+            BigDecimal all2 = BigDecimal.ZERO;
-            if(bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
+            if(bankContractLiquidated != null){
+                all2 = all2.add(bankContractLiquidated);
+            }
+            if(bankNominalPrice != null){
+                all2 = all2.add(bankNominalPrice);
+            }
+            if(bankOtherReceivable != null){
+                all2 = all2.add(bankOtherReceivable);
+            }
+            if(bankContractLiquidated != null && bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -995,7 +1004,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankContractLiquidated.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
+            if(bankNominalPrice != null && bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -1008,7 +1017,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankNominalPrice.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
+            if(bankOtherReceivable != null && bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());