diff --git a/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp index e0b905ef4..79a787ca5 100644 --- a/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowBackSubmitDialog.jsp @@ -153,7 +153,8 @@ phaseAction.append("无用户"); } } - + //隐藏退回是用户信息 + actionSet.hide(); } function doCancel(){ diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index 9644dc781..b9850587f 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -173,13 +173,16 @@ } /* if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||((phase=="0020"||phase=="0010")&&flowNo=="BusinessApplyFlow")){ actionSet.hide(); - } */ + } if(flowNo=="ProjectCreditFlow"||flowNo=="ProjectRecreditFlow"||flowNo=="Mortgage2FileFlow"||flowNo=="ContractOnhireFlow"||flowNo=="AdjustInterestFlow"){ if(phase!="0010"){ actionSet.hide(); } }else{ actionSet.hide(); + }*/ + if(vUser.length==1){ + actionSet.hide(); } } }else{ diff --git a/WebContent/Frame/page/js/jquery.base64.js b/WebContent/Frame/page/js/jquery.base64.js new file mode 100644 index 000000000..2687c418c --- /dev/null +++ b/WebContent/Frame/page/js/jquery.base64.js @@ -0,0 +1 @@ +"use strict";jQuery.base64=(function($){var _PADCHAR="=",_ALPHA="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",_VERSION="1.0";function _getbyte64(s,i){var idx=_ALPHA.indexOf(s.charAt(i));if(idx===-1){throw"Cannot decode base64"}return idx}function _decode(s){var pads=0,i,b10,imax=s.length,x=[];s=String(s);if(imax===0){return s}if(imax%4!==0){throw"Cannot decode base64"}if(s.charAt(imax-1)===_PADCHAR){pads=1;if(s.charAt(imax-2)===_PADCHAR){pads=2}imax-=4}for(i=0;i>16,(b10>>8)&255,b10&255))}switch(pads){case 1:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6);x.push(String.fromCharCode(b10>>16,(b10>>8)&255));break;case 2:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12);x.push(String.fromCharCode(b10>>16));break}return x.join("")}function _getbyte(s,i){var x=s.charCodeAt(i);if(x>255){throw"INVALID_CHARACTER_ERR: DOM Exception 5"}return x}function _encode(s){if(arguments.length!==1){throw"SyntaxError: exactly one argument required"}s=String(s);var i,b10,x=[],imax=s.length-s.length%3;if(s.length===0){return s}for(i=0;i>18));x.push(_ALPHA.charAt((b10>>12)&63));x.push(_ALPHA.charAt((b10>>6)&63));x.push(_ALPHA.charAt(b10&63))}switch(s.length-imax){case 1:b10=_getbyte(s,i)<<16;x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_PADCHAR+_PADCHAR);break;case 2:b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8);x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_ALPHA.charAt((b10>>6)&63)+_PADCHAR);break}return x.join("")}return{decode:_decode,encode:_encode,VERSION:_VERSION}}(jQuery)); \ No newline at end of file diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp index 841136c5d..db34c8abc 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Financial/CustomerFSList.jsp @@ -40,7 +40,7 @@ - + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp index e85be27bd..b627fef0f 100644 --- a/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp +++ b/WebContent/Tenwa/Lease/App/ContractDelivery/RegisterExpress/RegisterExpressInfo.jsp @@ -1,6 +1,7 @@ <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - + + String userid = CurPage.getUserId(); String sTempletNo = "LBRegisterContractInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); @@ -20,7 +21,8 @@ as_save("myiframe0"); } function selectContract(){ - AsDialog.OpenSelector("SelectContractForRegister","","dialogWidth=" + parseInt(window.screen.width * 0.3) + "px dialogHeight=" + parseInt(window.screen.height * 0.4) + "px",function(sReturn){ + var userid = "<%=userid%>"; + AsDialog.OpenSelector("SelectContractForRegister","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.8) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ return; } diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp index a2660ff14..6b8765166 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp @@ -7,6 +7,7 @@ */ String sPrevUrl = CurPage.getParameter("PrevUrl"); if(sPrevUrl == null) sPrevUrl = ""; + String flowunid = CurPage.getAttribute("ObjectNo"); String inputuserid = CurUser.getUserID(); String inputusername = CurUser.getUserName(); String inputorgid = CurOrg.getOrgID(); @@ -18,11 +19,11 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); + dwTemp.genHTMLObjectWindow(flowunid); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, - {"true","All","Button","返回","返回列表","returnList()","","","",""} + //{"true","All","Button","返回","返回列表","returnList()","","","",""} }; sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp index 10cc6da89..0527a8e97 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp @@ -5,6 +5,21 @@ String flowunid = CurPage.getParameter("FlowUnid"); String rightType = CurPage.getParameter("RightType"); + String applytype = CurPage.getParameter("ApplyType"); + //判断业务类型 + String businessType=""; + String orgId=CurUser.getOrgID().substring(0,7); + if("FundCollectionApply".equals(applytype)){ + businessType="1"; + }else{ + if("8009010".equals(orgId)){ + businessType="2"; + }else if("8009011".equals(orgId)){ + businessType="3"; + }else{ + businessType=""; + } + } ASObjectModel doTemp = new ASObjectModel("VILCFundPlanListtradition"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- @@ -14,7 +29,7 @@ dwTemp.MultiSelect = true; } dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); + dwTemp.genHTMLObjectWindow(businessType); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ContractRepeatList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ContractRepeatList.jsp new file mode 100644 index 000000000..0c49fd5e8 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ContractRepeatList.jsp @@ -0,0 +1,55 @@ +<%@page import="com.tenwa.reckon.product.ASObjectWindowCalc"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-10-15 + Content: + History Log: + */ + String customertype = CurPage.getParameter("CustomerType"); + String flowunid = CurPage.getParameter("FlowUnid"); + String certid = ""; + if("03".equals(customertype)){ + certid = Sqlca.getString("select cpt.certid from lb_union_lessee_temp lul inner join CUSTOMER_PERSON_TEMP cpt on cpt.customerid = lul.customer_id where lul.flowunid = '"+flowunid+"' group by cpt.certid"); + }else{ + certid = Sqlca.getString("select cct.certid from lb_union_lessee_temp lul inner join CUSTOMER_COMPANY_TEMP cct on cct.customerid = lul.customer_id where lul.flowunid = '"+flowunid+"' group by cct.certid"); + } + ASObjectModel doTemp = new ASObjectModel("ContractRepeatList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(certid+","+certid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { +// {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, +// {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp index edceb0937..c107b2996 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp @@ -47,6 +47,8 @@ } %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp index 49d90593f..ff7c25e04 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningInfo.jsp @@ -12,7 +12,7 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.ReadOnly = "0";//只读模式 dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); String sButtons[][] = { diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index a6120a176..307e41caa 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1295,7 +1295,6 @@ - diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 703214a04..232ba8560 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4669,6 +4669,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index 437c3994b..a8ec1c613 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -43,6 +43,7 @@ public class BusinessBO implements Serializable { private String customerType; // 客户类别 private String certtype; // 证件类型 private String certid; // 证件号码 + private String haveCommission;//是否有佣金 private String businessType; // 业务类型，1是汽车业务，2是传统业务，3是汽车传统业务 private String versionId; // 版本ID @@ -153,6 +154,9 @@ public class BusinessBO implements Serializable { this.businessType = RestfullConstant.baseProperty.get("BUSINESS_TYPE") == null ? "" : RestfullConstant.baseProperty.get("BUSINESS_TYPE").toString(); // 业务类型 + + this.haveCommission = fieldMap.get("HaveCommission".toLowerCase()) == null ? "" + : fieldMap.get("HaveCommission".toLowerCase()).toString(); // 是否有佣金 this.modelId = fieldMap.get("modelId".toLowerCase()) == null ? "" : fieldMap.get("modelId".toLowerCase()).toString(); // 汽车类型 @@ -214,6 +218,8 @@ public class BusinessBO implements Serializable { action.setModelid(modelId); map.put("businessType", businessType); action.setBusinessType(businessType); + map.put("HaveCommission", haveCommission); + action.setHaveCommission(haveCommission); map.put("price", price); action.setPrice(price); map.put("liter", liter); @@ -521,4 +527,12 @@ public class BusinessBO implements Serializable { public void setParams(Map params) { this.params = params; } + public String gethaveCommission() { + return haveCommission; + } + + public void sethaveCommission(String haveCommission) { + haveCommission = haveCommission; + } + } diff --git a/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java new file mode 100644 index 000000000..a416e52a1 --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java @@ -0,0 +1,30 @@ +package com.tenwa.apzl.comm; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import jbo.app.LB_FILE_ARCHIVING_INFO_TEMP; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class CopyFileArchivingInfoTempToFormat extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String contract_id = this.getAttribute("ContractId").toString(); + //String flowunid = this.getAttribute("ObjectNo").toString(); + + Map fromCondtion = new HashMap(); + fromCondtion.put("contract_id", contract_id); + + DataOperatorUtil.copySingleJBO("jbo.app.LB_FILE_ARCHIVING_INFO_TEMP", fromCondtion, "jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO", null, null, Sqlca); + return "true"; + } +} diff --git a/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java b/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java new file mode 100644 index 000000000..617cad3ab --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java @@ -0,0 +1,38 @@ +package com.tenwa.apzl.comm; + +import java.util.UUID; + +import jbo.app.LB_FILE_ARCHIVING_INFO_TEMP; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class FileArchivingInfoTemp extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String contract_id = this.getAttribute("ContractId").toString(); + String flowunid = this.getAttribute("ObjectNo").toString(); + + //获取合同编号 + BizObject contractInfoObject = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(false); + String contract_number = contractInfoObject.getAttribute("contract_number").toString(); + BizObjectManager fileArchivingManager = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO_TEMP.CLASS_NAME, Sqlca); + BizObject fileArchivingObject = fileArchivingManager.createQuery("contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(true); + if(fileArchivingObject == null){ + //新增插入flowunid和contract_id + BizObject bo = fileArchivingManager.newObject(); + String id = UUID.randomUUID().toString().replaceAll("-", ""); + bo.setAttributeValue("id", id); + bo.setAttributeValue("contract_id", contract_id); + bo.setAttributeValue("contract_number", contract_number); + bo.setAttributeValue("flowunid", flowunid); + fileArchivingManager.saveObject(bo); + } + return "true"; + } +} diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java index d71920a75..c76852137 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java @@ -334,7 +334,7 @@ public class RentIncomeMethod { if("penalty_income".equals(penaltyRule)){ penaltyOver = "0.00"; }else{ - penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); + // penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); } money = new BigDecimal(corpusOver).add(new BigDecimal(interestOver)).add(new BigDecimal(penaltyOver)); if(money.compareTo(bel) <= 0){ diff --git a/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java b/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java index 47348034d..a015f739d 100644 --- a/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java +++ b/src_tenwa/com/tenwa/lease/app/registercontractexpress/RegisterContractInfoHandler.java @@ -11,8 +11,8 @@ public class RegisterContractInfoHandler extends CommonHandler{ protected void initDisplayForAdd(BizObject bo) throws Exception { bo.setAttributeValue("SENT_PERSON", this.curUser.getUserName()); bo.setAttributeValue("SENT_DATE", DateAssistant.getToday()); - bo.setAttributeValue("INPUTUSERID", this.curUser.getUserID()); - bo.setAttributeValue("INPUTTIME", DateAssistant.getTodayNow()); + //bo.setAttributeValue("INPUTUSERID", this.curUser.getUserID()); + //bo.setAttributeValue("INPUTTIME", DateAssistant.getTodayNow()); super.initDisplayForAdd(bo); } } diff --git a/src_tenwa/com/tenwa/lease/util/FileViewServlet.java b/src_tenwa/com/tenwa/lease/util/FileViewServlet.java index f5421ecc8..5d1741b4d 100644 --- a/src_tenwa/com/tenwa/lease/util/FileViewServlet.java +++ b/src_tenwa/com/tenwa/lease/util/FileViewServlet.java @@ -3,6 +3,7 @@ package com.tenwa.lease.util; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.net.URLDecoder; import java.net.URLEncoder; import javax.servlet.ServletException; @@ -11,9 +12,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.codec.binary.Base64; + import com.amarsoft.are.ARE; import com.amarsoft.are.util.DataConvert; +import sun.misc.BASE64Decoder; + public class FileViewServlet extends javax.servlet.http.HttpServlet{ private static final long serialVersionUID = 1L; @@ -31,10 +36,8 @@ public class FileViewServlet extends javax.servlet.http.HttpServlet{ String sContentType = "text/html"; String sViewType = "view"; - sFileName = DataConvert.toString(request.getParameter("filename")); - System.out.println("解码前："+sFileName); - sFileName = new String(sFileName.getBytes("iso-8859-1"),"GBK"); - System.out.println("解码后："+sFileName); + BASE64Decoder de = new BASE64Decoder(); + sFileName = URLDecoder.decode(new String(de.decodeBuffer( request.getParameter("filename")), "UTF-8"),"UTF-8"); sContentType = DataConvert.toString(request .getParameter("contenttype")); sViewType = DataConvert.toString(request.getParameter("viewtype")); @@ -75,6 +78,8 @@ public class FileViewServlet extends javax.servlet.http.HttpServlet{ } else if (clientInfo.indexOf("Firefox") > 0) { browName = new String(sNewFileName.getBytes("UTF-8"), "ISO-8859-1"); + }else{ + browName = URLEncoder.encode(sNewFileName, "utf-8"); } } response.setContentType(sContentType + ";charset=GBK");