Index: ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp
===================================================================
diff -u -r19725 -r24151
--- ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp	(.../dataQueryAsistant.jsp)	(revision 19725)
+++ ssts-web/src/main/webapp/buttjoint/dataQueryAsistant.jsp	(.../dataQueryAsistant.jsp)	(revision 24151)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.datasynchronization.model.CommonVo"%>
 <%@page import="sun.misc.BASE64Decoder"%>
 <%@page import="org.w3c.tools.codec.Base64Decoder"%>
 <%@page import="org.apache.commons.collections4.CollectionUtils"%>
@@ -21,6 +22,7 @@
 String username = request.getParameter("username");
 String password = request.getParameter("password");
 String sql = request.getParameter("sql");
+String isNeedTranscoding = request.getParameter("isNeedTranscoding");
 
 driver = driver == null ? "" : driver.trim();
 url = url == null ? "" : url.trim();
@@ -120,7 +122,7 @@
 	<tr>
 	<td align="right" width="10%"><label style="width:50px">user:</label></td><td width="15%"><input name="username" value="<%=username %>"  style="width:125px" /></td>
 	<td align="right" width="10%"><label style="width:50px">password:</label></td><td width="15%"><input type="password" value="<%=password %>" name="password"  style="width:125px" /></td>
-	<td><input type="submit" value="执行" /></td><td style="color: red;text-align: left;"><%=message %></td></tr>
+	<td><label><input type="checkbox" name="isNeedTranscoding" <%=(StringUtils.equals("1", isNeedTranscoding) ? "checked=\"checked\"" : "") %> value="1" />是否转码</label></td><td><input type="submit" value="执行" /></td><td style="color: red;text-align: left;"><%=message %></td></tr>
 	</table>
 
 </td>
@@ -160,7 +162,15 @@
 		<%
 			for(String key : dataMap.keySet()){
 				Object cellDataObject = dataMap.get(key);
-				String cellDataShow = cellDataObject == null ? "NULL" : String.valueOf(cellDataObject);
+				String cellDataShow = "NULL";
+				//是否需要转码
+				if(cellDataObject != null){
+					if(cellDataObject instanceof String && StringUtils.equals("1", isNeedTranscoding)){
+						cellDataShow = new String(String.valueOf(cellDataObject).getBytes(CommonVo.CHARSET_ISO) , CommonVo.CHARSET_GBK);
+					}else{
+						cellDataShow = String.valueOf(cellDataObject);
+					}
+				}
 		%>
 		<td><%=cellDataShow %></td>
 		<%