From d1f1b489eea7730bb1cb78cdae24c626db835298 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Apr 2020 11:24:16 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ReportController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 93927f8..b01286f 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -92,9 +92,18 @@
public ResultBean<Boolean> getNExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ System.out.println(list);
String type = parameters.get("type").toString();
String time = parameters.get("time").toString();
- String timeb = parameters.get("timeb").toString();
+ System.out.println(parameters);
+ String timeb = "";
+ if (parameters.get("timeb") == null) {
+ timeb = parameters.get("time").toString();
+ } else {
+ timeb = parameters.get("timeb").toString();
+ }
+
+
String[] endTimes = timeb.split("-");
String dateFormat = "";
String beginTime = "";
--
Gitblit v1.8.0