From fff4bf38f1df496239b0165fd820ac2d2ec6d1c4 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 9 May 2019 09:23:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BA=A7=E5=93=81=E8=9E=8D=E8=B5=84=E9=A2=9D?= =?UTF-8?q?=E9=99=90=E9=A2=9D=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E3=80=82=202.=E4=BF=AE=E5=A4=8D=E9=99=90=E9=A2=9D=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 10 +++++----- .../WEB-INF/etc/app/component/component-config.xml | 2 +- calc/com/tenwa/reckon/product/ProductCondition.java | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index b8824c272..2193c7f9d 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -1012,25 +1012,25 @@ function saveRecord(sPostEvents){ //贷款比例不能大于产品配置 var cleanLeaseMoney=eval(getItemValue(0,0,"CLEAN_LEASE_MONEY"));//融资额 var EQUIP_AMT=eval(getItemValue(0,0,"EQUIP_AMT")); - var LeaseMoneyRatio = Number(cleanLeaseMoney/EQUIP_AMT).toFixed(6); + var LeaseMoneyRatio = Number(cleanLeaseMoney/EQUIP_AMT*100).toFixed(6); if(calcRules["fund"]["CLEAN_LEASE_MONEY"]){ var productCleanLeaseMoneyRatioMax = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["LeaseMoneyRatio"]["max"]);//贷款比例上限 var productCleanLeaseMoneyRatioMin = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["LeaseMoneyRatio"]["min"]);//贷款比例下限 var productCleanLeaseMoneyMax = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["max"]);//融资额上限 var productCleanLeaseMoneyMin = eval(calcRules["fund"]["CLEAN_LEASE_MONEY"]["min"]);//融资额下限 - if(LeaseMoneyRatioproductCleanLeaseMoneyRatioMax){ + if(LeaseMoneyRatio=>productCleanLeaseMoneyRatioMax){ AsDebug.showMessage("提示","综合融资额比例不能大于"+productCleanLeaseMoneyRatioMax+"%","","",true); return ; } - if(cleanLeaseMoneyproductCleanLeaseMoneyMax){ + if(cleanLeaseMoney=>productCleanLeaseMoneyMax){ AsDebug.showMessage("提示","融资额不能大于"+productCleanLeaseMoneyMax,"","",true); return ; } diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 48a27fd02..0c6fbe7be 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -1102,7 +1102,7 @@ - + diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 428abd4a4..041967437 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -488,6 +488,10 @@ public class ProductCondition { sb.append("'"+key.toUpperCase()+"':"+rule+""); } } + Map cleanLeaseMoney = ProductParamUtil.getProductComponentAllParameters(productId, "PRD0350", "MoneyLimits"); + if(cleanLeaseMoney.size()>0){ + sb.append(",'CLEAN_LEASE_MONEY':{'max':'"+cleanLeaseMoney.get("MoneyUpLimits")+"','min':'"+cleanLeaseMoney.get("MoneyLowLimits")+"','LeaseMoneyRatio':{'max':'"+cleanLeaseMoney.get("LeaseMoneyRatio-MAX")+"','min':'"+cleanLeaseMoney.get("LeaseMoneyRatio-MIN")+"'}}"); + } sb.append("}"); return sb.toString(); }