金融方案添加其他融贴息

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1367,6 +1367,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (otherPolicyYearRatio.contains("%")) {
                 otherPolicyYearRatio = otherPolicyYearRatio.replaceAll("%", "");
             }
+            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
+            if(loanFinOtherPolicy != null){
+                if(loanFinOtherPolicy.getYearRatio() != null){
+                    otherPolicyYearRatio = loanFinOtherPolicy.getYearRatio().toString();
+                }
+            }
             String otherPolicyAmount = query.getOtherPolicyAmount();
             if (StringUtils.isBlank(otherPolicyAmount)) {
                 return rb.setMsg("其它融贷款金额不能为空");
@@ -2049,7 +2055,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 list.add(getValueSpanSize(otherPolicyMonthlyRepayValue.toString(), 2, 0, false));
                 //其他融贴息
                 StringBuilder otherDiscountValue = new StringBuilder();
-                if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyMonthlyRepay())) {
+                if (StringUtils.isNotBlank(solutionssVo.getOtherDiscount())) {
                     otherDiscountValue = otherDiscountValue.append("其它融贴息：").append(solutionssVo.getOtherDiscount());
 
                 } else {