diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp index c6909b89d..e4b314553 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -24,9 +24,9 @@ function afterSearch(){ for(var i=0;i'+getItemValue(0,i,"FILENAME")+''; - getObj(0,i,"file").innerHTML=html; - } + html+=''+getItemValue(0,i,"file")+''; + getObj(0,i,"file").innerHTML=html; + }; } function downloadFile(id){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index b9d346c05..f6e139156 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -16,7 +16,7 @@ String paymentnumber=condition.getAttribute("payment_number").getString(); String contractId=condition.getAttribute("contract_id").getString(); String cautionmoney = Sqlca.getString("select caution_money from lc_calc_condition where CONTRACT_ID='"+contractId+"'"); - + String mayopemoney = Sqlca.getString("select sum(MAYOPE_MONEY) from LC_EBANK_TEMP where flowunid='"+flowunid+"'"); BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); String productId=flow.getAttribute("productId").getString(); @@ -96,6 +96,7 @@ setItemValue(0,getRow(),"SDNOMINAL_PRICE","0"); setItemValue(0,getRow(),"SDHANDLING_CHARGE","0"); setItemValue(0,getRow(),"OTHER_OUT","<%=cautionmoney%>"); + setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest); //¼ÆËãºÏͬծȯ×Ü¼Æ // setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal()); @@ -109,7 +110,6 @@ setItemValue(0,getRow(),"COLLECT_FEES","0.00"); setItemValue(0,getRow(),"DISPOSE_MONEY","0.00"); } - setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest); setItemValue(0,getRow(),"GUARANTEEMONEY","<%=cautionmoney%>"); setItemValue(0,getRow(),"CONTRACT_TOTAL",parseFloat(getItemValue(0,getRow(),"DUN_RENT"))+parseFloat(getItemValue(0,getRow(),"COLLECT_FEES"))+parseFloat(remaincorpus)); }else{ @@ -181,7 +181,15 @@ //¼ì²éÊÇ·ñ½øÐйý±ä¸ü var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>"); if(result == 'true'){ - setItemValue(0,getRow(),"MAXIMUM_TOTAL",updateContractBondTotal()); + var adjusttype = getItemValue(0,0,"ADJUST_TYPE"); + if("01"==adjusttype){ + setItemValue(0,getRow(),"MAXIMUM_TOTAL",updateContractBondTotal()); + var maximumtotal = updateContractBondTotal(); + if(Number(maximumtotal)>Number(<%=mayopemoney%>)){ + alert('×îÖÕ»¹¿î½ð¶î´óÓÚÍøÒøºËÏú½ð¶î£¡£¡£¡'); + return; + } + } as_save("myiframe0","run()"); }else{ alert('ÇëÏȳ·Ïú±ä¸ü£¬ÔÙ½øÐбä¸ü²Ù×÷£¡£¡£¡'); @@ -241,9 +249,12 @@ $("#A_div_1065").attr("style","display:block;"); $("#A_div_2506").attr("style","display:block;"); } - var paydayadjust = getItemValue(0,0,"PAYDAY_ADJUST"); - if(!(typeof(paydayadjust) == "undefined" || paydayadjust.length == 0)){ - getTerminateInfo(); + var ID = getItemValue(0,0,"ID"); + if(typeof(ID) == "undefined" || ID.length == 0){ + var paydayadjust = getItemValue(0,0,"PAYDAY_ADJUST"); + if(!(typeof(paydayadjust) == "undefined" || paydayadjust.length == 0)){ + getTerminateInfo(); + } } } function changeContract(){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp index dea2d3f83..469e6c462 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp @@ -7,6 +7,8 @@ */ String flowunid = CurPage.getParameter("FlowUnid"); String flowName = CurPage.getParameter("FlowName"); + //»ñÈ¡ÊÇ·ñÒѾ­Éú³ÉÌáÌáÇ°½áÇåÊý¾Ý + String number = Sqlca.getString("select COUNT(*) from LC_FUND_RENT_ADJUST_TEMP where flowunid='"+flowunid+"'"); String userID = CurUser.getUserID(); String orgID = CurUser.getOrgID(); ASObjectModel doTemp = new ASObjectModel("LCEbankTempList"); @@ -51,13 +53,16 @@ AsControl.OpenView(sUrl,'FlowUnid=' +sPara ,'_self',''); } function do_delete(){ + if(Number(<%=number%>)>0){ + alert("ÒÑÉú³É½áÇåÊý¾Ý£¬²»ÄÜɾ³ýÍøÒø£¡"); + return ; + } var ebanknumber = getItemValue(0,getRow(0),"EBANK_SN"); if(typeof(ebanknumber) == "undefined" || ebanknumber.length == 0 ){ alert("ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡"); return ; } if(confirm('ȷʵҪɾ³ýÂð?')){ - debugger; var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","deleteLCEbankTemp","flowunid=<%=flowunid%>,ebanknumber="+ebanknumber); if("true"==message){ as_delete(0,'alert(ɾ³ý³É¹¦£¡)'); diff --git a/WebContent/fileTemplate/租金支付表.docx b/WebContent/fileTemplate/租金支付表.docx new file mode 100644 index 000000000..945ff0d1c Binary files /dev/null and b/WebContent/fileTemplate/租金支付表.docx differ diff --git a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java index cbad96a0d..2d8bf2f26 100644 --- a/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java +++ b/src_core/com/tenwa/officetempalte/controller/FindCollectAction.java @@ -73,5 +73,44 @@ public class FindCollectAction { } return attributeid; } + + public static String findRightsName(String contractid) throws JBOException{ + + String filename = ""; + BizObjectManager bom = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE = bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'") + .setParameter("contractid", contractid) + .getSingleResult(false); + if (DOCRELATIVE != null) { + String DOCRELATIVEid = DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid = bom1.createQuery("relative_id=:relative_id") + .setParameter("relative_id", DOCRELATIVEid) + .getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2 = JBOFactory + .getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + filename = bom2.createQuery("library_id=:library_id") + .setParameter("library_id", DOCLIBRARYid) + .getSingleResult(false).getAttribute("filename").toString(); + } + return filename; + } + + public static String findRightsAttributeid(String contractid) throws JBOException{ + String attributeid=""; + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='rights'").setParameter("contractid", contractid).getSingleResult(false); + + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString(); + } + return attributeid; + } } \ No newline at end of file