修改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java

@@ -94,4 +94,6 @@ public class LoanSettleApplyDetailsVo {
     private String buyBackMoney;
     @ApiModelProperty("是否有结清确认按钮")
     private boolean confirmAtn;
+    @ApiModelProperty("当前公司结清合计")
+    private String settleAll2;
 }

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

@@ -1439,6 +1439,22 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
             loanSettleApplyDetailsVo.setShowHg(true);
             loanSettleApplyDetailsVo.setBusSid(sid);
+            //当前公司结清合计：回购申请的公司正常结清合计-回购后的月还款金额+（截止当前资金占用费-原回购申请的资金占用费）
+            BigDecimal settlyAll2 = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(companyCostVo.getSettleAll())){
+                settlyAll2 = settlyAll2.add(new BigDecimal(companyCostVo.getSettleAll()));
+            }
+            if(StringUtils.isNotBlank(loanSettleApplyDetailsVo.getBuyBackMoney())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(loanSettleApplyDetailsVo.getBuyBackMoney()));
+            }
+            if(StringUtils.isNotBlank(fundAll)){
+                settlyAll2 = settlyAll2.add(new BigDecimal(fundAll));
+            }
+            if(StringUtils.isNotBlank(companyCostVo.getFunfCost())){
+                settlyAll2 = settlyAll2.subtract(new BigDecimal(companyCostVo.getFunfCost()));
+            }
+            loanSettleApplyDetailsVo.setSettleAll2(settlyAll2.toString());
+
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }