后台热点管理的更新

src/main/java/com/cloudcross/ssp/model/mapper/log.sql.xml

@@ -102,7 +102,7 @@
 		<include refid="base_column" />
 		from t_log where 
 		table_name=#{tableName}
-		record_id=#{recordId}
+		and record_id=#{recordId}
 		order by id  desc
 		limit #{pager.offset}, #{pager.limit}
 	</select>
@@ -112,7 +112,7 @@
 		<include refid="base_column" />
 		from t_log where 
 		table_name=#{tableName}
-		record_id=#{recordId}
+		and record_id=#{recordId}
 		order by id  desc
 	</select>
 </mapper>

src/main/java/com/cloudcross/ssp/model/mapper/wifi.sql.xml

@@ -105,7 +105,6 @@
 				and (t_wifi.apmac like #{searchValue})
 			</if>
 		</where> 
-		limit #{pager.offset}, #{pager.limit}
 	</select>
 	
 	<select id="countByParamsOperator" parameterType="map" resultType="int">

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

@@ -635,7 +635,7 @@ public class ApmacController extends SimpleController {
 		paramMap.put("column", column);
 
 		String excelTemplate = templateProcessor.processTemplate(
-				"excel/logReport.ftl", paramMap);
+				"excel/logReportOperator.ftl", paramMap);
 		try {
 			PrintWriter out = response.getWriter();
 			out.write(excelTemplate);
@@ -749,6 +749,8 @@ public class ApmacController extends SimpleController {
 				&& !"".equals(paramMap.get("placeId"))) {
 			placeId = Long.parseLong(String.valueOf(paramMap.get("placeId")));
 			placeName = placeService.findById(placeId).getName();
+		} else {
+			placeName = "全部";
 		}
 
 		if(null != paramMap.get("place") && !"".equals(paramMap.get("place"))) {

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

@@ -37,9 +37,11 @@ import com.cloudcross.ssp.model.PlaceOperator;
 import com.cloudcross.ssp.model.Wifi;
 import com.cloudcross.ssp.service.ILocationService;
 import com.cloudcross.ssp.service.ILogService;
+import com.cloudcross.ssp.service.IOperatorService;
 import com.cloudcross.ssp.service.IPlaceOperatorService;
 import com.cloudcross.ssp.service.IPlaceService;
 import com.cloudcross.ssp.service.IWifiService;
+import com.cloudcross.ssp.service.impl.OperatorService;
 
 /**
  * 热点详情相关控制器
@@ -63,6 +65,8 @@ public class ApmacController extends SimpleController {
 	private FreemarkerTemplateProcessor templateProcessor;
 	@Autowired
 	private IPlaceService placeService;
+	@Autowired
+	private IOperatorService operatorService;
 	
 	/**
 	 * 热点详情的列表页
@@ -602,7 +606,7 @@ public class ApmacController extends SimpleController {
 			@RequestParam Long id) {
 		HashMap<String, Object> paramMap = new HashMap<String, Object>();
 		Account account = getLoginUser();
-		paramMap.put("operatorId", account.getOperatorId());
+		paramMap.put("operatorName", operatorService.findById(account.getOperatorId()).getCompanyName());
 		paramMap.put("tableName", "t_wifi");
 		paramMap.put("recordId", id);
 		List<Log> logList = logService.findByParams1(paramMap);
@@ -621,7 +625,7 @@ public class ApmacController extends SimpleController {
 		paramMap.put("column", column);
 
 		String excelTemplate = templateProcessor.processTemplate(
-				"excel/logReport.ftl", paramMap);
+				"excel/logReportOperator.ftl", paramMap);
 		try {
 			PrintWriter out = response.getWriter();
 			out.write(excelTemplate);

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

@@ -51,7 +51,7 @@
    <Column ss:Index="5" ss:AutoFitWidth="0" ss:Width="74.25"/>
    <Column ss:Width="63"/>
    <Row>
-    <Cell ss:MergeAcross="9"><Data ss:Type="String">运营商Id：${operatorId!} </Data></Cell>
+    <Cell ss:MergeAcross="9"><Data ss:Type="String">运营商：${operatorName!} </Data></Cell>
    </Row>
   	 <Row>
 	    <Cell><Data ss:Type="String">变更时间</Data></Cell>