From 8f00a1ff77acbdb86b5d8b117a40f65ed475023d Mon Sep 17 00:00:00 2001 From: zhaoxin Date: Fri, 26 Jul 2019 16:04:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=80=E5=B9=B4=E4=BB=A5=E5=86=85?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=A6=8224=E6=9C=9F=EF=BC=8C=E5=9C=A83?= =?UTF-8?q?=E6=9C=9F=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=EF=BC=8C=E8=BF=9D?= =?UTF-8?q?=E7=BA=A6=E8=B4=B9=E7=94=A813=E6=9C=9F=E5=8C=85=E6=8B=AC13?= =?UTF-8?q?=E7=9A=84=E5=89=A9=E4=BD=99=E6=9C=AC=E9=87=91=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=202=E3=80=81=E4=B8=80=E5=B9=B4=E4=BB=A5=E5=A4=96=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E5=89=A9=E4=BD=99=E6=9C=AC=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp | 3 ++- calc/com/tenwa/reckon/executor/RentCalHelper.java | 1 + .../contract/onhirechange/LBRentPlanFormalToHisBusiness.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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);