diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index dd0028db8..63cc2fde4 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -1157,13 +1157,14 @@ function saveRecord(sPostEvents){ if ( 'Y' === '<%=flexible%>' ) { var yearRate = getItemValue( 0, 0, 'YEAR_RATE' ); var rentValue = getItemValue( 0, 0, 'RENT_VALUE' ); - if ( Number( yearRate ) === 0 && Number( rentValue ) === 0 ) { - alert( '灵活产品下,请在测算年利率或预计租金中填值' ); + + if(yearRate>0 || ( Number( yearRate ) === 0 && Number( rentValue ) === 0 )){ + setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' ); + }else if(rentValue>0 && Number( yearRate ) === 0 ){ + setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' ); + }else{ + alert( '灵活产品下,测算年利率或预计租金不能为空或者小于0' ); return; - } else if ( Number( yearRate ) === 0 ) { - setItemValue( 0, 0, 'RENT_OR_RATE', 'rent' ); - } else { - setItemValue( 0, 0, 'RENT_OR_RATE', 'rate' ); } var cautionMoneyRatio = getItemValue( 0, 0, 'CAUTION_MONEY_RATIO' ); var firstPaymentRatio = getItemValue( 0, 0, 'FIRST_PAYMENT_RATIO' ); diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 26072cc6b..f6644f1e1 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -92,7 +92,7 @@ public class CreateTransactionExecutor implements Transaction { String yearRate = bean.getCb().getYearRate(); this.preHandle(bean.getCb(),bean); checkYearRate( bean.getCb(), bean, new BigDecimal( bean.getCb().getYearRate() ) );//当初理解错误,成本利率和年利率不一样 - if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<=0){ + if(bean.getCb().getRentOrRate().equals("rent")&&new BigDecimal(bean.getCb().getIncomeNumber()).multiply(new BigDecimal(bean.getCb().getRentValue())).compareTo(new BigDecimal(bean.getCb().getCleanLeaseMoney()))<0){ throw new BusinessException("按租金算年利率租金总和不能小于融资额"); } bean.setProductType(productType);