back 维度修改，地域报表修改

src/main/java/com/cloudcross/ssp/service/impl/AdReportService.java

@@ -378,7 +378,7 @@ public class AdReportService implements IAdReportService {
 
 	@Override
 	public List<DeliverAnalysis> findByTotalForExcelAdvertiser(Map<String, Object> paramMap) {
-		return iBatisDao.getList("advertiser.adReportSqlMapper.findByTotalForExcelAdvertiser", paramMap);
+		return iBatisDao.getList("adReportSqlMapper.findByTotalForExcelAdvertiser", paramMap);
 	}
 
 	@Override
@@ -541,7 +541,7 @@ public class AdReportService implements IAdReportService {
 
 	@Override
 	public int findCountForLocationBack(Map<String, Object> paramMap) {
-		return iBatisDao.get("back.adReportSqlMapper.findCountForLocationBack", paramMap);
+		return iBatisDao.get("adReportSqlMapper.findCountForLocationBack", paramMap);
 	}
 
 	@Override

src/main/java/com/cloudcross/ssp/web/back/main/ad/report/AdvertiserReportController.java

@@ -918,52 +918,66 @@ public class AdvertiserReportController extends SimpleController {
 		paramMap.put("startDate",  startDate);
 		paramMap.put("endDate",  endDate);
 		
-		
-		List<DeliverAnalysis> reportList = adReportService.findByTotalForExcelBack(paramMap);
-		
-		if(reportList.size() == 0){
-//			List sumList = reportList.get(0).get
-			paramMap.put("impressionSum", 0);
-			paramMap.put("clickSum", 0);
-			paramMap.put("visitSum", 0);
-			paramMap.put("conversionSum", 0);
-			paramMap.put("consumeSum", 0);
-			paramMap.put("eCmpSum", 0);
-			paramMap.put("clickRatesum", 0);
-			paramMap.put("visitRatesum", 0);
-			paramMap.put("conversionRatesum", 0);
-		}
-		else {
-		//数据报表中第一栏 全部  的显示
-			paramMap.put("impressionSum", reportList.get(0).getImpressionSum());
-			paramMap.put("clickSum", reportList.get(0).getClickSum());
-			paramMap.put("visitSum", reportList.get(0).getVisitSum());
-			paramMap.put("conversionSum", reportList.get(0).getConversionSum());
-			paramMap.put("consumeSum", reportList.get(0).getConsumeSum());
-			paramMap.put("eCmpSum", reportList.get(0).geteCmpSum());
-			paramMap.put("clickRatesum", reportList.get(0).getClickRatesum());
-			paramMap.put("visitRatesum", reportList.get(0).getVisitRatesum());
-			paramMap.put("conversionRatesum", reportList.get(0).getConversionRatesum());
-		}
 		//维度数据匹配导出
-		
-		
-		
-		
-		
-		List<HashMap<String,Object>> dimensionlist = new ArrayList<HashMap<String,Object>>();
-		if(dimensionId != null && !"".equals(dimensionId)){
-			dimensionlist = getDimensionById(dimensionId);
-			if(dimensionlist.size() >0 ){
-				String content = "";
-				for (int i = 0; i < dimensionlist.size(); i++) {
-					content += dimensionlist.get(i).get("dimension")+"-";
+				List<HashMap<String,Object>> dimensionlist = new ArrayList<HashMap<String,Object>>();
+				if(dimensionId != null && !"".equals(dimensionId)){
+					dimensionlist = getDimensionById(dimensionId);
+					if(dimensionlist.size() >0 ){
+						String content = "";
+						for (int i = 0; i < dimensionlist.size(); i++) {
+							content += dimensionlist.get(i).get("dimension")+"-";
+						}
+						content = content.substring(0,content.length()-1);
+						paramMap.put("dimension",content);
+						paramMap.put("dimensionTargetlist",dimensionlist);
+						paramMap.put("dimensionStr", dimensionlist.get(dimensionlist.size()-1).get("dimensionStr"));
+					}
+				}
+				
+				List<DeliverAnalysis> reportList = adReportService.findByTotalForExcelAdvertiser(paramMap);
+				if(reportList.size() == 0){
+					paramMap.put("impression", 0);
+					paramMap.put("click", 0);
+					paramMap.put("visit", 0);
+					paramMap.put("conversion", 0);
+					paramMap.put("consume", 0);
+					paramMap.put("eCmp", 0);
+					paramMap.put("clickRate", 0);
+					paramMap.put("visitRate", 0);
+					paramMap.put("conversionRate", 0);
+				}else {
+					double impressionSum = 0;
+					double clickSum = 0;
+					double visitSum = 0;
+					double conversionSum = 0;
+					double consumeSum = 0;
+					double eCmpSum = 0;
+					double clickRatesum = 0;
+					double visitRatesum = 0;
+					double conversionRatesum = 0;
+					for(DeliverAnalysis d :reportList){
+						impressionSum = impressionSum+d.getImpression();
+						clickSum = clickSum + d.getClick();
+						visitSum = visitSum + d.getVisit();
+						conversionSum = conversionSum + d.getConversion();
+						consumeSum = consumeSum + d.getConsume();
+						eCmpSum = eCmpSum + d.geteCmp();
+						
+					}
+					clickRatesum = 100*clickSum/impressionSum;
+					visitRatesum = 100*visitSum/clickSum;
+					conversionRatesum = 100*conversionSum/visitSum;
+				//数据报表中第一栏 全部  的显示
+					paramMap.put("impressionSum",impressionSum);
+					paramMap.put("clickSum",clickSum);
+					paramMap.put("visitSum",visitSum);
+					paramMap.put("conversionSum",conversionSum);
+					paramMap.put("consumeSum",consumeSum);
+					paramMap.put("eCmpSum",eCmpSum);
+					paramMap.put("clickRatesum",clickRatesum);
+					paramMap.put("visitRatesum",visitRatesum);
+					paramMap.put("conversionRatesum",conversionRatesum);
 				}
-				content = content.substring(0,content.length()-1);
-				paramMap.put("dimension",content);
-				paramMap.put("dimensionTargetlist",dimensionlist);
-			}
-		}
 		
 		//显示的列
 		paramMap.put("impression", null);//曝光