diff --git a/WebContent/Frame/page/js/as_control.js b/WebContent/Frame/page/js/as_control.js index 1a9b1666b..40399ec3d 100644 --- a/WebContent/Frame/page/js/as_control.js +++ b/WebContent/Frame/page/js/as_control.js @@ -99,9 +99,24 @@ var AsControl = { */ randomNumber:function() { return Math.abs(Math.sin(new Date().getTime())).toString().substr(2); - } -}; + }, +}; +AsControl.postICMS = function(url,param){ + let temp_form = document.createElement("form"); + temp_form.action = url; + temp_form.target = "_blank"; + temp_form.method = "post"; + temp_form.style.display = "none"; + + let opt = document.createElement("textarea"); + opt.name = 'data'; + opt.value = param; + temp_form.appendChild(opt); + + document.body.appendChild(temp_form); + temp_form.submit(); +}; /** * 通过Mozilla 的PDF阅读器在web上预览PDF文件 */ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp index e7e556398..5378b07b2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp @@ -6,6 +6,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 @@ -103,7 +105,7 @@ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -120,34 +122,16 @@ return; } let code = 'ECM0002'; - if(("<%=sPhaseNo%>"=="0010")){ + if(("<%=FlowNo%>"=="BContractApproveFlow"||"<%=FlowNo%>"=="BContractChangeFlow"||"<%=FlowNo%>"=="BContractSupportFlow"||"<%=FlowNo%>"=="ContractOnhireCarChangeFlow")&&"<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; } let busiNo= "<%=projectNo%>"; if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp index b9179fd19..915c15608 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp @@ -5,6 +5,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String sPrevUrl = CurPage.getParameter("PrevUrl"); String sFlowUnid = CurPage.getParameter("FlowUnid"); String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 @@ -47,7 +49,7 @@ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -59,6 +61,10 @@ } let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } let code = 'ECM0002'; if("<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; @@ -67,28 +73,9 @@ if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index ddaff7e11..46020e1d6 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -7,6 +7,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 @@ -178,7 +180,7 @@ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -195,35 +197,17 @@ return; } let code = 'ECM0002'; - if(("<%=sPhaseNo%>"=="0010")){ + if(("<%=FlowNo%>"=="BusinessApplyFlow"||"<%=FlowNo%>"=="BusinessChangeFlow")&&"<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; } let busiNo="<%=projectNo%>" if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 5e19eb7e3..54a4499d3 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -6,6 +6,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String orgId = CurUser.getOrgID(); String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); @@ -18,7 +20,6 @@ //String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); String projectId = CurPage.getParameter("ProjectId"); String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'"); - String userId = CurUser.getUserID(); //gps来源 中瑞1 天易0 String source = Sqlca.getString("SELECT SOURCE from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'"); String orderNo = Sqlca.getString("SELECT ORDER_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'"); @@ -175,7 +176,7 @@ window.onload = function(){ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -187,6 +188,10 @@ window.onload = function(){ } let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } let code = 'ECM0002'; if("<%=phaseNo%>"=="0010"){ code = 'ECM0001'; @@ -195,28 +200,9 @@ window.onload = function(){ if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=flowunid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 1fb69fb4a..be3b0a676 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -18,6 +18,8 @@ import java.util.List; public abstract class ImageService { public Logger logger = Logger.getLogger(this.getClass()); protected String allAppInfo; + protected String userCode; + protected String userName; protected String appCode; protected String appName; protected String code; @@ -25,10 +27,15 @@ public abstract class ImageService { protected ImageBaseData base; protected ImageBatch batch; protected ImageMetaData metaData; + public void addBaseData(){ base = new ImageBaseData(); - base.setUserCode("admin"); - base.setUserName("admin"); + if("".equals(userCode)||userCode==null){ + userCode = "system"; + userName = "system"; + } + base.setUserCode(userCode); + base.setUserName(userName); base.setOrgCode("0005"); base.setComCode("0005"); base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); @@ -182,4 +189,19 @@ public abstract class ImageService { this.allAppInfo = allAppInfo; } + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } }