From d56af5de4b57b9b29f9af7d4b9613001cc47a587 Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 30 Jun 2021 10:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E5=89=8D=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BA=8C=E6=AC=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Ample/Doc/DocListInfoNew.jsp | 4 +- WebContent/Ample/Doc/DocListUploadNew.jsp | 4 +- WebContent/WEB-INF/etc/jbo/jbo_oti.xml | 5 +- .../apzl/CorpusSource/FcRequestDocTab.jsp | 6 +- .../apzl/CorpusSource/FcRequestFileList.jsp | 20 ++-- .../tenwa/apzl/CorpusSource/FcRequestLIst.jsp | 11 +-- .../fundchannel/doc/action/DocListAction.java | 95 ++++++++++++++----- src_jbo/jbo/oti/FC_REQUEST.java | 6 +- 8 files changed, 100 insertions(+), 51 deletions(-) diff --git a/WebContent/Ample/Doc/DocListInfoNew.jsp b/WebContent/Ample/Doc/DocListInfoNew.jsp index ffa45bfc8..7d90f3938 100644 --- a/WebContent/Ample/Doc/DocListInfoNew.jsp +++ b/WebContent/Ample/Doc/DocListInfoNew.jsp @@ -4,7 +4,7 @@ <% //获得组件参数 String flowNo=CurPage.getParameter("FlowNo"); - String fcQueuestId = CurPage.getParameter("fcQueuestId"); + String fcRequestId = CurPage.getParameter("fcRequestId"); String fcFlowType = CurPage.getParameter("fcFlowType"); String fcFileCode = CurPage.getParameter("fcFileCode"); @@ -105,7 +105,7 @@ threads:<%=QuartzPropertiesUtil.get("fileNumLimit") %>, formData: { - fcQueuestId:'<%=fcQueuestId%>', + fcRequestId:'<%=fcRequestId%>', fcFlowType:'<%=fcFlowType%>', fcFileCode:'<%=fcFileCode%>' }, diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp index e7274dbb3..57e1c3ecb 100644 --- a/WebContent/Ample/Doc/DocListUploadNew.jsp +++ b/WebContent/Ample/Doc/DocListUploadNew.jsp @@ -71,13 +71,13 @@ if(params.size()>0){ BizObjectManager frfBom = JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE",Sqlca); BizObject frfBo = frfBom.newObject(); - frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcQueuestId")); + frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcRequestId")); frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType")); frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode")); frfBo.setAttributeValue("FC_FILE_TYPE",params.get("type")); frfBo.setAttributeValue("FILE_NAME",params.get("name")); frfBo.setAttributeValue("FILE_PATH",params.get("filePath")); - frfBo.setAttributeValue("FC_FILE_STS",""); + frfBo.setAttributeValue("FC_FILE_STS","0"); frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime")); frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime")); frfBo.setAttributeValue("DEL_FLAG","0"); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index 652f16a47..d714bd101 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -303,8 +303,8 @@ - - + + @@ -328,7 +328,6 @@ - diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp index 7de490eb3..91ce0356c 100644 --- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp +++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp @@ -1,12 +1,14 @@ <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/IncludeBegin.jsp"%> <% - String fcLoanQueuestId = CurPage.getParameter("fcLoanQueuestId"); + String fcRequestId = CurPage.getParameter("fcRequestId"); + //todo 提交后将消息已读并已处理 + String messageId = CurPage.getParameter("messageid"); String channelNo=CurPage.getParameter("channelNo"); String projectId=CurPage.getParameter("projectId"); String contractId=CurPage.getParameter("contractId"); String isReadOnly = CurPage.getParameter("isReadOnly"); - String params="fcLoanQueuestId="+fcLoanQueuestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly; + String params="fcRequestId="+fcRequestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly+"messageId"+messageId; //参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是) diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp index 2a2213b89..08297a394 100644 --- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp +++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp @@ -7,39 +7,39 @@ Content: 示例详情页面 History Log: */ - String productId=CurPage.getParameter("productId"); String fcFlowType=CurPage.getParameter("fcFlowType"); - String fcQueuestId=CurPage.getParameter("fcLoanQueuestId"); + String fcRequestId=CurPage.getParameter("fcRequestId"); String isReadOnly = CurPage.getParameter("isReadOnly"); + String messageId = CurPage.getParameter("messageId"); String sPrevUrl = CurPage.getParameter("PrevUrl"); - if(sPrevUrl == null) sPrevUrl = ""; + if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp"; String sTempletNo=CurPage.getParameter("TempletNo"); if(sTempletNo==null){ sTempletNo="FcRequestFileList"; } if("N".equals(isReadOnly)){ - isReadOnly = new DocListAction(fcQueuestId,fcFlowType).isFileAppendCheck(); + isReadOnly = new DocListAction(fcRequestId,fcFlowType).isFileAppendCheck(); } ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setLockCount(0); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "1";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(fcFlowType+","+fcQueuestId); + dwTemp.genHTMLObjectWindow(fcFlowType+","+fcRequestId); String sButtons[][] = { {"Y".equals(isReadOnly)?"false":"true","All","Button","提交资料","修改完毕，确认提交","updateStatus()","","","",""}, - // {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + {"true","All","Button","返回列表","返回列表","returnList()","","","",""} }; sButtonPosition = "north"; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>