diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index eb6290a7a..2f1127e56 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -72,6 +72,7 @@ var terminateInfo = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateInfo","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust); var rentPlanDate = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","rentPlanDate","contractId=<%=contractId%>,paydayAdjust="+paydayAdjust); var remaincorpus = terminateInfo.remaincorpus; + var remaincorpusbreak = terminateInfo.remaincorpusbreak; var remaininterest = terminateInfo.remaininterest; var overduerent = terminateInfo.overduerent; var remainfpenalty = terminateInfo.remainfpenalty; @@ -103,7 +104,7 @@ ratio = (Number("<%=ratio%>")/100).toFixed(2); } - setItemValue(0,getRow(),"HANDLING_CHARGE",Math.round(Number(remaincorpus*ratio)*100)/100); + setItemValue(0,getRow(),"HANDLING_CHARGE",Math.round(Number(remaincorpusbreak*ratio)*100)/100); var dateRate=Number("<%=yearrate%>")/100;//获取利率 // var sDate1 = getItemValue(0,getRow(),"PAYDAY_DATE");//获取提出日期 var idays = datedifference(rentPlanDate,paydayAdjust);//获取约定终止日和提出日期相差天数 diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java index 02899ae9f..51a1a836f 100644 --- a/calc/com/tenwa/reckon/executor/RentCalHelper.java +++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java @@ -154,6 +154,7 @@ public class RentCalHelper { BizObjectManager bm = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME); Conn conn = new Conn(tx); String sql = "select sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') >= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remaincorpus else 0 end ) remaincorpus," + +" sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') >= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') and t.planlist >12 then t.remaincorpus else 0 end ) remaincorpusbreak," //一年以内的,违约费用13期包括13的剩余本金计算 ;一年以外的,用剩余本金计算 + " sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remaininterest else 0 end ) remaininterest, " +" sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.corpus else 0 end ) remainfincorpus," + "sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.penalty else 0 end ) remainfpenalty," diff --git a/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/LBRentPlanFormalToHisBusiness.java b/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/LBRentPlanFormalToHisBusiness.java index a31aee683..a2248ba3c 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/LBRentPlanFormalToHisBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/onhirechange/LBRentPlanFormalToHisBusiness.java @@ -17,7 +17,7 @@ public class LBRentPlanFormalToHisBusiness extends BaseBussiness { this.initBussinessParam(Sqlca); String flowUnid=this.getAttribute("ObjectNo").toString(); Map fromCondtion=new HashMap(); - fromCondtion.putIfAbsent("CONTRACT_ID", this.getAttribute("ContractId").toString()); + fromCondtion.put("CONTRACT_ID", this.getAttribute("ContractId").toString()); Map otherProperty=new HashMap(); otherProperty.put("FLOWUNID", flowUnid);