From 497e0b7b1d5e39e3cdabbe33e8431253e6b003ac Mon Sep 17 00:00:00 2001 From: user Date: Thu, 19 Jul 2018 12:04:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6=E4=B8=80=E8=A7=88=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/PayDocList.jsp | 4 ++++ WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index a05f4a991..4e7dd54fa 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -46,6 +46,10 @@ docParam.put("proj_id", flow.getAttribute("proj_id").getString()); docParam.put("contract_id", flow.getAttribute("contract_id").getString()); docParam.put("flow_unid", flowunid); + docParam.put("inputtime", StringFunction.getTodayNow()); + docParam.put("inputuserid", CurPage.getUserId()); + docParam.put("inputorgid", CurPage.getUser().getOrgID()); + //判断是否存在，不存在就从配置表倒到临时表 DocListInitAction.initDocList(docParam,other,docClassItemno,CurConfig); ASObjectModel doTemp = new ASObjectModel(sTempletNo); diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index 55fb10056..cebf3c50b 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -24,10 +24,11 @@ if(type==""){ BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 otherWhere=DocListInitAction.getFlowWhere(flow,"","O"); + //otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC"; }else if("proj".equals(type)){ - otherWhere=" and O.proj_id='"+proj_id+"'"; + otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC"; }else if("contract".equals(type)){ - otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"')"; + otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') order by O.INPUTTIME DESC"; }