From 530aeddc3a2fc1310f68f6c76c82fb4aa99145b4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:31:53 +0800
Subject: [PATCH] 报表 优化

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index ff16681..a2ca92a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -429,8 +429,6 @@
 	public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		parameters.put("type", "month");
-		parameters.put("format", "yyyy-MM");
-		parameters.put("typeFormat", "%Y-%m-%d");
 		parameters.put("monitorPointId", parameters.remove("monitorPoint"));
 		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
 		String sensorKey = parameters.get("sensorKey").toString();

--
Gitblit v1.8.0