From 7e0b9190e84c283e7e0349a69ff89813c546f82e Mon Sep 17 00:00:00 2001 From: amarsoft Date: Wed, 29 Aug 2018 10:54:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorChange/CustomerDistributorChangeApplyList.jsp | 2 +- .../DistributorChange/LDistributorChangeAccountHis.jsp | 2 +- .../DistributorChange/LDistributorChangeInfoHis.jsp | 2 +- .../DistributorChange/LDistributorIncludeBandA.jsp | 4 +++- .../DistributorManage/DistributorChange/LDistributorInfo.jsp | 5 +++-- .../commbusiness/DistributorAccountFormalToTempBusiness.java | 2 +- .../commbusiness/DistributorInfoFormalToTempBusiness.java | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/CustomerDistributorChangeApplyList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/CustomerDistributorChangeApplyList.jsp index 9556c1db3..679ed3825 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/CustomerDistributorChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/CustomerDistributorChangeApplyList.jsp @@ -18,7 +18,7 @@ var projectName = sReturn[3]+"-"+sReturn[2]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams = sParams+",FlowKey="+distributor_code+",ProjectName="+projectName+",distributor_no="+distributor_no+",distributor_name="+distributor_name; + sParams = sParams+",ProjectId="+distributor_no+",FlowKey="+distributor_code+",ProjectName="+projectName+",distributor_no="+distributor_no+",distributor_name="+distributor_name; //sParams = sParams+",FlowKey="+distributor_no+",distributor_no="+distributor_no+",distributor_name="+distributor_name; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp index b36884741..b342e59fa 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp @@ -10,7 +10,7 @@ if(sFlowUnid == null) sFlowUnid=""; BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false); - String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); + String DISTRIBUTOR_NO=flow.getAttribute("proj_id").getString(); String sTempNo = "LDistributorChangeAccountHis"; if("true".equals(IsHistory)){ sTempNo = "LDistributorChangeAccountRealHis"; diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp index 6033e34db..ef62f7972 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeInfoHis.jsp @@ -7,7 +7,7 @@ */ String sFlowUnid = CurPage.getParameter("FlowUnid");//Á÷³Ì±àºÅ if(sFlowUnid == null) sFlowUnid=""; - String DISTRIBUTOR_NO=CurPage.getParameter("distributor_no"); + String DISTRIBUTOR_NO=CurPage.getParameter("DISTRIBUTOR_NO"); String sTempletNo = "LDistributorInfoS";//--Ä£°åºÅ-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorIncludeBandA.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorIncludeBandA.jsp index 3dddc48fe..61ce06544 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorIncludeBandA.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorIncludeBandA.jsp @@ -9,7 +9,9 @@ if(sFlowUnid == null) sFlowUnid=""; String sTempletNo ="LDistributorIncludeBandA"; BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false); - String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); + //String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); + + String DISTRIBUTOR_NO=CurPage.getParameter("distributor_no"); ASObjectModel doTemp = new ASObjectModel(sTempletNo); //doTemp.setColTips("", "²âÊÔ"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp index e3d855afc..210c7e709 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp @@ -25,8 +25,9 @@ //if(sTempletNo == null) sTempletNo = "LDistributorInfo"; String sTempletNo ="LDistributorInfoAfterChange"; BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false); - String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); - + // String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString(); + + String DISTRIBUTOR_NO=CurPage.getParameter("DISTRIBUTOR_NO"); ASObjectModel doTemp = new ASObjectModel(sTempletNo); //doTemp.setColTips("", "²âÊÔ"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountFormalToTempBusiness.java index 0a2d2eb76..b8f0d2080 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountFormalToTempBusiness.java @@ -41,7 +41,7 @@ public class DistributorAccountFormalToTempBusiness extends BaseBussiness { BizObject flow = DataOperatorUtil.getSingleJBO(FLOW_BUSSINESS_OBJECT.CLASS_NAME, searchCondtion, Sqlca); if(flow!=null){ fromCondtion.clear(); - fromCondtion.put("distributor_id",flow.getAttribute("flow_key").getString()); + fromCondtion.put("distributor_id",flow.getAttribute("proj_id").getString()); otherCondtion.clear(); otherCondtion.put("flowunid", this.getAttribute("FlowUnid").toString()); DataOperatorUtil.copyJBOSet(DISTRIBUTOR_ACCOUNT.CLASS_NAME, fromCondtion, DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME, null, otherCondtion, null, Sqlca); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoFormalToTempBusiness.java index 68deb2733..e95d2686f 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoFormalToTempBusiness.java @@ -39,7 +39,7 @@ public class DistributorInfoFormalToTempBusiness extends BaseBussiness { BizObject flow = DataOperatorUtil.getSingleJBO(FLOW_BUSSINESS_OBJECT.CLASS_NAME, searchCondtion, Sqlca); if(flow!=null){ fromCondtion.clear(); - fromCondtion.put("distributor_no",flow.getAttribute("flow_key").getString()); + fromCondtion.put("distributor_no",flow.getAttribute("proj_id").getString()); otherCondtion.clear(); otherCondtion.put("flowunid", this.getAttribute("FlowUnid").toString()); DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO_TEMP.CLASS_NAME, null, otherCondtion, null, Sqlca); From 05455ac360f2569755bc3d6d2fc641b3dbce6c01 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 29 Aug 2018 11:11:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=8F=90=E8=AF=B7=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContractEnd/rightsFileList.jsp | 6 +-- .../LCContractTerminateInfo.jsp | 23 ++++++++--- .../LCContractTerminate/LCEbankTempList.jsp | 7 +++- WebContent/fileTemplate/租金支付表.docx | Bin 0 -> 13854 bytes .../controller/FindCollectAction.java | 39 ++++++++++++++++++ 5 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 WebContent/fileTemplate/租金支付表.docx 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 0000000000000000000000000000000000000000..945ff0d1cf46de12eb2ca35444905302c3b3bbcc GIT binary patch literal 13854 zcmb_@WmF!^(k>9(-Q9yra1HJb!3pl}7TlfS?(S~E-QC??g9N>hefG&t?*6`Yf81W{ zWrmr0s=KOYs;8=}WyIeBLjt_D0I5yhx8vUp;`Kz&Qdh>t(#n=r=9LWj^#b@$GATh5 zzCb_#fG8jU0Qi5BX$7D<&yUpjXJzzVmje z3lt;%$neoEE-iC_8EfwY%(!k$nY`eN!>s|RCEeLOG&l{cm27*tV!@PfBkWAXrZ|)O zK+B?HJyhXQTg59SO7(76y90>;aZFruK`r18?`^u2p3hhEmi-Qp-d?D0wo(p9?|HX5&Dy8_4Fw3O-vQ01xw&haZlt?FRpX{)WW17AvEKeaVt z$sY`DnOWYqZR4*A-5Z!UfJc%3a7(buXrD|_f;{cwuNX1G(Rg87G#3-z;1HT}V`%;+ z#uHY3(8n-9dc`o%Czwh#MJR40i^`TNn-nXK&rbv{td-qRJ$Z%!!r-f2`*g5i`McG! zyH_9dU#;f(YBhv^T20r|M*q!hVbPLOU3Bn%w<5~~m)w<8HRGy5lz@l9Vj{p^^C~yv zLc~&f&62L~VA~0lJEBpR{nK?LbBxKoL53z=uST#Ux-KZhQ%Q`zZd35J3P-*Z+h&lh z2G{6Daty@QZH(p|K@l*50S#Mt)+C3duz@jTr{!G&4wa9J$;=8IUtaXqG3&-=uxJ^~ zq_`lR!>Cs*G;CPkj2i>E1!rr=P^M|zX#i~!6c(VC3x-vpvReemX^-Rs9mG6#<$k_V z9Z&pGohj>(qM|b=SSyd^7*E|Jbi7RY)vmXS>KlWRj=~RjHzqDFOC@_G#kN?0Zoc

w9>dw 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 literal 0 HcmV?d00001 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 From c153e3c327a90502c61f00d7fdd42b2cac05540a Mon Sep 17 00:00:00 2001 From: amarsoft Date: Wed, 29 Aug 2018 11:29:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerDistributorApprovalApplyList.jsp | 2 +- .../DistributorApproval/LDistributorAccountInfo.jsp | 2 +- .../DistributorApproval/LDistributorAccountList.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/CustomerDistributorApprovalApplyList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/CustomerDistributorApprovalApplyList.jsp index 428303b3e..5631d4fcc 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/CustomerDistributorApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/CustomerDistributorApprovalApplyList.jsp @@ -15,7 +15,7 @@ var distributorId ="<%=distributorId%>"; var projectName = "<%=distributorId%>"; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams=sParams+",FlowKey="+distributorId+",ProjectName="+projectName+",distributorId=<%=distributorId%>"; + sParams=sParams+",ProjectId="+distributorId+",FlowKey="+distributorId+",ProjectName="+projectName+",distributorId=<%=distributorId%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp index 2d4324b2e..0a154ba96 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp @@ -13,7 +13,7 @@ String sTempletNo = "LDistributorAccountInfo"; //Ä£°åºÅ // if(sTempletNo == null) sTempletNo = "LDistributorAccountInfo"; BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); - String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("Flow_Key").getString():""; + String DISTRIBUTOR_NO=flow!=null?flow.getAttribute("proj_id").getString():""; ASObjectModel doTemp = new ASObjectModel(sTempletNo); diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp index 4bcea2eea..15ad618e6 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp @@ -13,7 +13,7 @@ String ishistory=CurPage.getParameter("IsHistory"); String RightType=CurPage.getParameter("RightType"); String disno=""; - List nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where di.id=O.flow_key and flow_unid=:flowunid") + List nolist=JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT").createQuery("select di.distributor_no from O ,jbo.app.tenwa.customer.DISTRIBUTOR_INFO di where di.id=O.proj_id and flow_unid=:flowunid") .setParameter("flowunid",sFlowUnid).getResultList(false); if(nolist.size()>0){ disno=nolist.get(0).getAttribute("distributor_no").getString(); From c065ddaf41e701d4558fe396bb8be328486ff249 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 29 Aug 2018 11:34:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=202.=E4=BF=AE=E5=A4=8D=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=80=E8=A7=88=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/DocListMain.jsp | 2 +- WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp | 2 +- src_core/com/tenwa/doc/action/DocListInitAction.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp index 78d9018fa..3a7c073a9 100644 --- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp +++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp @@ -40,7 +40,7 @@ var docList="<%=docList%>"; myleft.width=1; if("SingleRow"=="<%=type%>"){ - if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"){ + if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"){ AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); }else{ AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right",""); diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index 9e08c6616..2e8663b6b 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -46,7 +46,7 @@ dwTemp.ReadOnly = "1"; dwTemp.MultiSelect=true;//¶àÑ¡ dwTemp.setPageSize(50); - dwTemp.genHTMLObjectWindow(""); + dwTemp.genHTMLObjectWindow(flowunid); //0¡¢ÊÇ·ñչʾ 1¡¢ ȨÏÞ¿ØÖÆ 2¡¢ չʾÀàÐÍ 3¡¢°´Å¥ÏÔʾÃû³Æ 4¡¢°´Å¥½âÊÍÎÄ×Ö 5¡¢°´Å¥´¥·¢Ê¼þ´úÂë 6¡¢ 7¡¢ 8¡¢ 9¡¢Í¼±ê£¬CSS²ãµþÑùʽ 10¡¢·ç¸ñ String sButtons[][] =null; if((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true"))){ diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index aa1eda3cb..7003ca4f6 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -201,6 +201,7 @@ public class DocListInitAction { || "BContractHandoverFlow".equals(param.get("ObjectType")) || "BContractSupportFlow".equals(param.get("ObjectType")) || "FundPaymentCarFlow".equals(param.get("ObjectType")) + || "MortgageFileFlow".equals(param.get("ObjectType")) || "BusinessCancelFlow".equals(param.get("ObjectType"))) { sql = "select * from O left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on O.RELATIVE_ID=rela.id where config_id=:configid and rela.proj_id='" + param.get("proj_id") + "'";