测试修改细节问题（后台）

src/main/java/com/cloudcross/ssp/web/back/main/ClientAccountController.java

@@ -2,6 +2,7 @@ package com.cloudcross.ssp.web.back.main;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -496,6 +497,16 @@ public class ClientAccountController extends SimpleController{
 				paramMap.put("sysType",new Long(0));
 			}
 		}
+		//导出报表时，请求方式为get，中文会有乱码问题，需要转码
+		if(paramMap.containsKey("searchValue") && paramMap.get("searchValue") != null && paramMap.get("searchValue") != ""){
+			try {
+				String value = new String(paramMap.get("searchValue").toString().getBytes("ISO-8859-1"),"UTF-8");
+				paramMap.put("searchValue", value);
+			} catch (UnsupportedEncodingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
 		Account loginAccount = getLoginUser();
 		paramMap.put("loginAccount", loginAccount);
 		List<ClientAccount> accountList = clientAccountService.findExcelAccounts(paramMap);

src/main/java/com/cloudcross/ssp/web/back/main/ap/ApmacController.java

@@ -749,7 +749,7 @@ public class ApmacController extends SimpleController {
 		 * 下面对传递过来的几个参数进行处理
 		 */
 		try{
-		if(null != paramMap.get("selectedOperatorId") && !"".equals(paramMap.get("selectedOperatorId"))) {
+		if(null != paramMap.get("selectedOperatorId") && !"".equals(paramMap.get("selectedOperatorId")) && paramMap.get("selectedOperatorId") != "-1") {
 			operatorId = Long.parseLong(String.valueOf(paramMap.get("selectedOperatorId")));
 			operatorName = operatorService.findById(operatorId).getCompanyName();
 		} else {

src/main/resources/template/excel/apList.ftl

@@ -65,6 +65,7 @@
 	    <Cell><Data ss:Type="String">Apmac</Data></Cell>
 	    <Cell><Data ss:Type="String">场景</Data></Cell>
 	    <Cell><Data ss:Type="String">数聚场景</Data></Cell>
+	    <Cell><Data ss:Type="String">数聚子场景</Data></Cell>
 	    <Cell><Data ss:Type="String">最后更新时间</Data></Cell>
 	    <Cell><Data ss:Type="String">状态</Data></Cell>
    </Row>
@@ -80,8 +81,9 @@
 		   <Cell><Data ss:Type="String">${wifi.longitude!}</Data></Cell>
 		   <Cell><Data ss:Type="String">${wifi.latitude!}</Data></Cell>
 		   <Cell><Data ss:Type="String">${wifi.apmac!}</Data></Cell>
-		   <Cell><Data ss:Type="String">${wifi.placeName!}</Data></Cell>
 		   <Cell><Data ss:Type="String">${wifi.place!}</Data></Cell>
+		   <Cell><Data ss:Type="String">${wifi.placeClassName!}</Data></Cell>
+		   <Cell><Data ss:Type="String">${wifi.placeName!}</Data></Cell>
 		   <Cell><Data ss:Type="String">${wifi.updated?string('yyyy/MM/dd')}</Data></Cell>
 		    <Cell><Data ss:Type="String"><#if wifi.status==1>暂停<#else>开启</#if></Data></Cell>
 		   </Row>

src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl

@@ -85,7 +85,7 @@
 				    </tbody>
 				</table>
 				<div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel()">导出Excel</a>
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_list()">导出Excel</a>
 				</div>
 				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>