From 3b50aa4a23bd3ccb2bf71109b84dea65bd9ffc07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 06 May 2020 11:02:25 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ReportController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 8e0f4ef..4925ff3 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -160,6 +160,11 @@
beginTime = time + " 00";
endTime = timeb + " 23";
i = Calendar.HOUR_OF_DAY;
+ }else if(type.equals("hour")){
+ dateFormat="yyyy-MM-dd HH:mm";
+ beginTime=time+":00:00";
+ endTime=timeb+":59:00";
+ i=Calendar.MINUTE;
}
SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
--
Gitblit v1.8.0