anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into tangfutang

Browse Source
This commit is contained in:
tangfutang 2018-08-30 18:49:10 +08:00
commit 5fdc4c49b8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Tenwa/Comm/Document/DocImageShow.jsp
View File

@ -20,7 +20,6 @@ border-bottom:1px solid #BCBCBC;}
String flowunid=CurPage.getParameter("ObjectNo");
String sObjectType=CurPage.getParameter("FlowNo");
String type=CurPage.getParameter("type");
if(type==null)type="";
@ -37,7 +36,7 @@ border-bottom:1px solid #BCBCBC;}
}
String compClientID = request.getParameter("CompClientID");
String sql="select O.id,lib.doc_name,filename from O left join jbo.app.tenwa.doc.LB_DOCLIBRARY lib on o.library_id=lib.id left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on lib.relative_id=rela.id";
sql+=" where O.content_type LIKE '%image%' "+otherWhere+"and rela.flow_unid='"+flowunid+"'order by lib.doc_name,O.filename";
sql+=" where O.content_type LIKE '%image%' "+otherWhere+"and rela.objecttype='"+sObjectType+"' order by lib.doc_name,O.filename";
System.out.println(sql);
List<BizObject> list=JBOFactory.createBizObjectQuery("jbo.app.tenwa.doc.LB_DOCATTRIBUTE", sql).getResultList(false);

6
WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp
View File

@ -2,6 +2,10 @@
<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
<%@page import="com.amarsoft.are.jbo.BizObject"%>
<%@page import="com.amarsoft.are.jbo.JBOException"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
<%@page import="jbo.sys.FLOW_OBJECT"%>
<%
/*
Author: undefined 2016-09-01
@ -46,7 +50,7 @@
dwTemp.ReadOnly = "1";
dwTemp.MultiSelect=true;//多选
dwTemp.setPageSize(50);
dwTemp.genHTMLObjectWindow(flowunid);
dwTemp.genHTMLObjectWindow(sObjectType);
//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"))){