结清申请增加字段

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

@@ -3,6 +3,8 @@ package com.yxt.anrui.riskcenter.api.loansettleapply;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -47,7 +49,8 @@ public class SettleApplyCommonVo {
     private String companyCurrentNotPrice;
     @ApiModelProperty("贷款保证金扣罚金额")
     private String deductionAmount;
-
+    @ApiModelProperty("公司未到期金额")
+    private String bankNotPrice;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
     private String bankSid;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java

@@ -28,7 +28,7 @@ public class LoanSettleCompanyCost extends BaseEntity {
     private BigDecimal bankOverInterest;
     @ApiModelProperty("公司当期未到期月还")
     private BigDecimal companyCurrentNotPrice;
-    @ApiModelProperty("资方未到期金额")
+    @ApiModelProperty("公司未到期金额")
     private BigDecimal bankNotPrice;
     @ApiModelProperty("贷款保证金扣罚金额")
     private BigDecimal deductionAmount;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java

@@ -25,7 +25,7 @@ public class LoanSettleCompanyCostVo {
     private String bankOverInterest;
     @ApiModelProperty("公司当期未到期月还")
     private String companyCurrentNotPrice;
-    @ApiModelProperty("资方未到期金额")
+    @ApiModelProperty("公司未到期金额")
     private String bankNotPrice;
     @ApiModelProperty("贷款保证金扣罚金额")
     private String deductionAmount;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java

@@ -26,5 +26,9 @@ public class LoanSettleCompanyReduction extends BaseEntity {
     private BigDecimal amountTo;
     @ApiModelProperty("结清利润")
     private BigDecimal profit;
+    @ApiModelProperty("公司未到期利息减免")
+    private BigDecimal notDuePriceRelief;
+    @ApiModelProperty("减免依据")
+    private BigDecimal reliefBasis;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReductionVo.java

@@ -23,4 +23,8 @@ public class LoanSettleCompanyReductionVo {
     private String amountTo;
     @ApiModelProperty("结清利润")
     private String profit;
+    @ApiModelProperty("公司未到期利息减免")
+    private String notDuePriceRelief;
+    @ApiModelProperty("减免依据")
+    private String reliefBasis;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -617,6 +617,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         //公司未到期月还
         String notDuePrice = baseMapper.selectGsWdq(busVinSid, settingDate);
         settleApplyCommonVo.setNotDuePrice(notDuePrice);
+        settleApplyCommonVo.setBankNotPrice(notDuePrice);
         //贷款保证金
         //根据销售订单查询还款计划主表
         LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);