diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp new file mode 100644 index 000000000..3b2edf2da --- /dev/null +++ b/WebContent/Tenwa/Comm/Document/LBDocumentICMS.jsp @@ -0,0 +1,64 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% + /* + Author: undefined 2017-10-24 + Content: + History Log: + */ +%> +<% + String FlowNo=CurPage.getParameter("FlowNo"); + String FlowUnid=CurPage.getParameter("ObjectNo"); + String sPhaseNo = CurPage.getParameter("PhaseNo"); + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); +%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java b/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java index 3bfb092ff..0aadf26fa 100644 --- a/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java +++ b/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java @@ -1,12 +1,5 @@ package com.tenwa.flow.tabviewservice; -import java.util.List; - -import jbo.sys.FLOW_MODEL; -import jbo.sys.FLOW_TASK; -import jbo.sys.OBJECTTYPE_CATALOG; -import jbo.sys.OBJECTTYPE_RELA; - import com.amarsoft.app.awe.config.InitDBType; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; @@ -14,6 +7,12 @@ import com.amarsoft.are.jbo.BizObjectQuery; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.ui.widget.Button; +import jbo.sys.FLOW_MODEL; +import jbo.sys.FLOW_TASK; +import jbo.sys.OBJECTTYPE_CATALOG; +import jbo.sys.OBJECTTYPE_RELA; + +import java.util.List; public class FlowTaskViewTab { private String flowNo; //Á÷³ÌÅäÖñàºÅ @@ -114,7 +113,11 @@ public class FlowTaskViewTab { BizObjectManager bm = null; BizObjectQuery bq = null; bm = JBOFactory.getFactory().getManager(OBJECTTYPE_RELA.CLASS_NAME); - bq = bm.createQuery("O.OBJECTTYPE=:OBJECTTYPE and isinuse='Y' order by O.sortno ").setParameter("OBJECTTYPE", this.getObjectType()); + String sql = "O.OBJECTTYPE=:OBJECTTYPE and isinuse='Y' order by O.sortno "; + if("OtherPayFlow".equals(getFlowNo())){ + sql = "O.OBJECTTYPE=:OBJECTTYPE and (isinuse='Y' or ATTRIBUTE1='flow') order by O.sortno "; + } + bq = bm.createQuery(sql).setParameter("OBJECTTYPE", this.getObjectType()); this.viewTabItemList=bq.getResultList(true);