diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index a863f67f3..0577bca74 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -95,7 +95,7 @@ setItemValue(0,getRow(),"REPURCHASE_RATIO","100"); //回购本金 setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus); - setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent); + //setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent); // setItemValue(0,getRow(),"FIST_CORPUS","0"); var ratio=0; @@ -105,7 +105,7 @@ ratio = (Number("<%=ratio%>")/100).toFixed(2); } - setItemValue(0,getRow(),"HANDLING_CHARGE",Math.round(Number(remaincorpusbreak*ratio)*100)/100); + setItemValue(0,getRow(),"HANDLING_CHARGE",Math.round(Number(remaincorpus*ratio)*100)/100); var dateRate=Number("<%=yearrate%>")/100;//获取利率 // var sDate1 = getItemValue(0,getRow(),"PAYDAY_DATE");//获取提出日期 var idays = datedifference(rentPlanDate,paydayAdjust);//获取约定终止日和提出日期相差天数 @@ -136,7 +136,8 @@ }else{ var HandlingCharge = getItemValue(0, 0, "HANDLING_CHARGE"); //setItemValue(0,getRow(),"OTHER_IN","0.00"); - setItemValue(0,getRow(),"CONTRACT_TOTAL",Number(overduerent)+Number(sumpenalty)+Number(remaincorpus)+Number(terminateInfo.fist_rent)+Number(HandlingCharge)+Number(getItemValue(0,getRow(),"OTHER_IN"))+Number(getItemValue(0,getRow(),"NOMINAL_PRICE"))-Number(getItemValue(0,getRow(),"OTHER_OUT")).toFixed(2)+REPAYMENT); + //setItemValue(0,getRow(),"CONTRACT_TOTAL",Number(overduerent)+Number(sumpenalty)+Number(remaincorpus)+Number(terminateInfo.fist_rent)+Number(HandlingCharge)+Number(getItemValue(0,getRow(),"OTHER_IN"))+Number(getItemValue(0,getRow(),"NOMINAL_PRICE"))-Number(getItemValue(0,getRow(),"OTHER_OUT")).toFixed(2)+REPAYMENT); + setItemValue(0,getRow(),"CONTRACT_TOTAL",Number(overduerent)+Number(sumpenalty)+Number(remaincorpus)+Number(HandlingCharge)+Number(getItemValue(0,getRow(),"OTHER_IN"))+Number(getItemValue(0,getRow(),"NOMINAL_PRICE"))-Number(getItemValue(0,getRow(),"OTHER_OUT")).toFixed(2)+REPAYMENT); } } } @@ -145,13 +146,13 @@ var dunrent = getItemValue(0,getRow(),"DUN_RENT"); var dunPenalty = getItemValue(0,getRow(),"DUN_PENALTY"); var corpusOverage = getItemValue(0,getRow(),"CORPUS_OVERAGE"); - var fistRent = getItemValue(0,getRow(),"FIST_RENT"); + //var fistRent = getItemValue(0,getRow(),"FIST_RENT"); var handlingCharge = getItemValue(0,getRow(),"HANDLING_CHARGE"); var otherin = getItemValue(0,getRow(),"OTHER_IN"); var otherout = getItemValue(0,getRow(),"OTHER_OUT"); var nominalPrice=getItemValue(0,getRow(),"NOMINAL_PRICE"); return Number(dunrent ? dunrent : 0 ) + Number(dunPenalty ? dunPenalty : 0 ) + Number(corpusOverage ? corpusOverage : 0 ) - + Number(fistRent ? fistRent : 0 ) + Number(handlingCharge ? handlingCharge : 0 ) + Number(otherin ? otherin : 0 ) + + Number(handlingCharge ? handlingCharge : 0 ) + Number(otherin ? otherin : 0 ) - Number(otherout ? otherout : 0 ) + Number(nominalPrice ? nominalPrice : 0 ) ; } @@ -161,14 +162,14 @@ var dunrent = getItemValue(0,getRow(),"DUN_RENT"); var agreedPenalty = getItemValue(0,getRow(),"AGREED_PENALTY"); var corpusOverage = getItemValue(0,getRow(),"CORPUS_OVERAGE"); - var fistCorpus = getItemValue(0,getRow(),"FIST_CORPUS"); + //var fistCorpus = getItemValue(0,getRow(),"FIST_CORPUS"); var sdhandlingCharge = getItemValue(0,getRow(),"SDHANDLING_CHARGE"); var otherin = getItemValue(0,getRow(),"OTHER_IN"); var otherout = getItemValue(0,getRow(),"OTHER_OUT"); var sdnominalPrice=getItemValue(0,getRow(),"SDNOMINAL_PRICE"); var agreeddatepenalty=getItemValue(0,getRow(),"AGREED_DATEPENALTY"); return (Number(dunrent ? dunrent : 0 ) + Number(agreedPenalty ? agreedPenalty : 0 ) + Number(corpusOverage ? corpusOverage : 0 ) - + Number(fistCorpus ? fistCorpus : 0 ) + Number(sdhandlingCharge ? sdhandlingCharge : 0 ) + Number(otherin ? otherin : 0 ) + + Number(sdhandlingCharge ? sdhandlingCharge : 0 ) + Number(otherin ? otherin : 0 ) - Number(otherout ? otherout : 0 ) + Number(sdnominalPrice ? sdnominalPrice : 0 ) +Number(agreeddatepenalty ? agreeddatepenalty : 0 )).toFixed(2); } //计算债券总计 diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp index 3b20da482..791632317 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp @@ -17,6 +17,12 @@ var contract_number = sReturn[3]; var project_name = sReturn[4]; var payment_number = sReturn[5]; + //校验是否有保证金代偿 + var isCompensation = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","isCompensation","contractId="+contract_id); + if("false" == isCompensation){ + alert("该合同有保证金代偿，无法发起提请结清！"); + return ; + } var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; sParams =sParams+",payment_number="+payment_number+",ProjectId="+project_id+",FlowKey="+payment_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.terminate.TerminateFlowStartAction","initFLow",sParams); diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java index 51a1a836f..7111d27f9 100644 --- a/calc/com/tenwa/reckon/executor/RentCalHelper.java +++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java @@ -345,6 +345,16 @@ public class RentCalHelper { } + //校验合同是否有保证金代偿 + public String isCompensation() throws Exception{ + BizObjectManager lrpManage = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME); + List lrps = lrpManage.createQuery(" contract_id=:contractId AND COLLECT_STATUS='代偿' ").setParameter("contractId", contractId).getResultList(false); + if(lrps.size()>0){ + return "false"; + } + return "true"; + } + public String getContractId() { return contractId; }