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/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(); 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/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/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") + "'"; 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 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);