diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index dbc83d6b7..e365ffcc9 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -871,8 +871,8 @@ function getRatioByMoney(e){ setValue(key,Number(money*fundRatio/100).toFixed(2)); }else{ if(Number(equipAmt)!=0){ - if(key='FIRST_PAYMENT'){ - fundMoney=firstPayment; + if(key=='FIRST_PAYMENT'){ + fundMoney=Number(firstPayment).toFixed(2); fundRatio=Number(fundMoney/money*100).toFixed(6); setValue(key,fundMoney); } @@ -887,7 +887,7 @@ function getRatioByMoney(e){ } } // var firstPayment = Number(getItemValue(0, 0, "FIRST_PAYMENT")); - if(allMoney != 0 && firstPayment != 0) { + if(allMoney != 0 ) { setItemValue(0, 0, "ALL_FIRST_PAYMENT", firstPayment + ""); setItemValue(0, 0, "ALL_FIRST_PAYMENT_RATIO", ((firstPayment / allMoney) * 100).toFixed(6)); setItemValue(0, 0, "ALL_FIRST_PAYMENT_RATIO_0", ((firstPayment / allMoney) * 100).toFixed(6)); diff --git a/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/ConditionCheck.java b/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/ConditionCheck.java index ea10cdd4c..dd022fa82 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/ConditionCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/ConditionCheck.java @@ -38,6 +38,9 @@ public class ConditionCheck extends DefaultBussinessCheck { List rentList=JBOFactory.createBizObjectQuery(LC_RENT_PLAN_TEMP.CLASS_NAME,"flowunid=:flowunid and payment_number=:paymentnumber order by plan_list").setParameter("flowunid",flowunid).setParameter("paymentnumber", paymentnumber).getResultList(false); int i=0; Date date=bo.getAttribute("start_date").getDate(); + String a=bo.getAttribute("CLEAN_LEASE_MONEY").getString(); + String b=bo.getAttribute("EQUIP_END_VALUE").getString(); + //期末余值为空,导致报错 BigDecimal cleanMoney=new BigDecimal(bo.getAttribute("CLEAN_LEASE_MONEY").getString()).subtract(new BigDecimal(bo.getAttribute("EQUIP_END_VALUE").getString())); BigDecimal corpus=BigDecimal.ZERO; BigDecimal CORPUS_BUSINESS=BigDecimal.ZERO;