From e5450f808a6555528eee7aec5c3331abdbf998a5 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 24 Dec 2020 18:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4=E3=80=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E3=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=82=B9=E5=87=BB=E6=9F=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp | 2 +- WebContent/Tenwa/Comm/Document/DocImageShow.jsp | 2 +- WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp | 2 +- src_core/com/tenwa/doc/action/DocListInitAction.java | 8 +++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp index 333e59745..615fc0d3f 100644 --- a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp @@ -169,7 +169,7 @@ function showWord(id,name){ } function showImage(id,name){ var sUrl="/Tenwa/Comm/DocList/showImage.jsp"; - var param="attrid="+id; + var param="attrid="+id+"&objecttype=<%=sObjectType%>&flowunid=<%=flowunid%>"; AsDialog.PopView(sUrl,param,"dialogWidth=480px;dialogHeight=400px;",function(message){ },name); diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp index 4c2172b73..0a1b3049c 100644 --- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp +++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp @@ -97,7 +97,7 @@ for(int i=0;i function showImage(id,name){ var sUrl="/Tenwa/Comm/DocList/showImage.jsp"; - var param="attrid="+id+"&flowunid=<%=flowunid%>"; + var param="attrid="+id+"&objecttype=<%=sObjectType%>&flowunid=<%=flowunid%>"; AsDialog.PopView(sUrl,param,"dialogWidth="+(parent.innerWidth-100)+"px;dialogHeight="+(parent.innerHeight+80)+"px;",function(message){ },name); diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index 62c67e95d..cddfada96 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -151,7 +151,7 @@ function showWord(id,name){ } function showImage(id,name){ var sUrl="/Tenwa/Comm/DocList/showImage.jsp"; - var param="attrid="+id; + var param="attrid="+id+"&objecttype=<%=sObjectType%>&flowunid=<%=flowunid%>"; AsDialog.PopView(sUrl,param,"dialogWidth="+(parent.innerWidth-100)+"px;dialogHeight="+(parent.innerHeight+80)+"px;",function(message){ },name); diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index e4983622c..3edeadb88 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -496,7 +496,13 @@ public class DocListInitAction { BizObject boLDR = null; List boListLDR = null; if(objecttype!=null){ - if(objecttype!=""){ + if("BusinessChangeFlow".equals(objecttype)||"BContractApproveFlow".equals(objecttype)||"BContractChangeFlow".equals(objecttype)){ + BizObjectManager fboManage = JBOFactory.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME); + BizObject fbo = fboManage.createQuery(" flow_unid=:flow_unid ").setParameter("flow_unid", flowunid).getSingleResult(false); + boListLDR = bomLDR.createQuery(" proj_id =:proj_id and objecttype='BusinessApplyFlow'") + .setParameter("proj_id", fbo==null?"":fbo.getAttribute("proj_id").getString()) + .getResultList(false); + }else if(objecttype!=""){ boLDR = bomLDR.createQuery("flow_unid =:flowunid and objecttype=:objecttype") .setParameter("flowunid", flowunid) .setParameter("objecttype", objecttype)