diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index 1558522a2..edcef4b11 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -243,7 +243,7 @@ function downloadZipFile(){ var sParams="projectId="+projectId+",classItemnos="+classItemnos+",objectType="+objectType; var ids = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","getLibraryIds",sParams); var filePath="<%=CurConfig.getConfigure("FileSavePath")%>"; - var param="&flowunid=<%=flowunid%>&type=<%=type%>&ids="+ids; + var param="&flowunid=<%=flowunid%>&type=<%=type%>&ids="+ids+"&proj_id="+projectId; if(!frames["downloadTemplate"]) $("").appendTo("body"); window.open(sWebRootPath+"/servlet/view/docFlowDownloadZipServlet?CompClientID=<%=sCompClientID%>&filePath="+filePath+param, "downloadTemplate"); } diff --git a/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java b/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java index 6bbc6c9cc..1c89863c8 100644 --- a/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java +++ b/src_core/com/tenwa/doc/servlet/DocFlowDownloadZipServlet.java @@ -66,11 +66,10 @@ import com.tenwa.util.ZipFileUtil; BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "ID='"+req.getParameter("contract_id")+"'").getSingleResult(false); zipName=contract.getAttribute("CONTRACT_NUMBER").getString(); - }else if (type=="fundPay"){ + }else if ("fundPay".equals(type)){ otherWhere=" and (rela.objecttype='FundPaymentCarFlow' AND rela.proj_id='"+req.getParameter("proj_id")+"')"; - BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "ID='"+req.getParameter("contract_id")+"'").getSingleResult(false); - - zipName=contract.getAttribute("CONTRACT_NUMBER").getString(); + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 + zipName=flow.getAttribute("proj_name").getString().replace("/", "-"); } //初始化ZIP存储目录 @@ -82,7 +81,7 @@ import com.tenwa.util.ZipFileUtil; ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file)); for(BizObject lib:libs){ @SuppressWarnings("unchecked") - List attrs=JBOFactory.createBizObjectQuery(LB_DOCATTRIBUTE.CLASS_NAME,"library_id=:id and deleteed<>'Y' OR deleteed IS NULL").setParameter("id",lib.getAttribute("id").getString()).getResultList(false); + List attrs=JBOFactory.createBizObjectQuery(LB_DOCATTRIBUTE.CLASS_NAME,"library_id=:id and (deleteed<>'Y' OR deleteed IS NULL )").setParameter("id",lib.getAttribute("id").getString()).getResultList(false); if(attrs.size()==0){ continue; }