From 48bfa4e57cd2195b86bd8c0debe2e241db0ba80d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Feb 2018 14:49:44 +0800
Subject: [PATCH] 报表

---
 src/main/java/com/moral/controller/ReportController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 1726d19..3da3cf3 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -38,7 +38,7 @@
 	@GetMapping("excel")
 	public ResultBean<Boolean> getExcelReport(HttpServletRequest request,HttpServletResponse response) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData4Excel(parameters); 
+		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); 
 		String[][] exportColumn =  new String[2][];
 		exportColumn[0] = new String[] { "������", "20", "time" };
 		if (parameters.containsKey("sensors")) {

--
Gitblit v1.8.0