From ec192d94be582e5fa504cb355090ce98e0880e65 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 10:40:57 +0800
Subject: [PATCH] 修改时间bug
---
src/main/java/com/moral/controller/WebController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 998389a..a6fe5fe 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -302,11 +302,12 @@
String yearAndMonth = "";
String startTime = "";
Integer endMinute = Integer.parseInt(String.valueOf(minute.charAt(minute.length() - 1)));
- if (endMinute >= 6) {
+ if (endMinute >= 6||endMinute==0) {//��������������������� 6 7 8 9 0 ������12:16,12:20��������� ���������12:10-12:15���������
+ date = DateUtil.rollMinute(date, -1);
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "0:00").toString();
- } else {
- date = DateUtil.rollMinute(date, -5);
+ }else {// ���������������������1 2 3 4 5 ������������������������������ ������12:11������������ ���������12:05-12:10���������
+ date = DateUtil.rollMinute(date, -9);
StringBuilder time = new StringBuilder(sdf.format(date));
startTime = time.replace(15, 19, "5:00").toString();
}
--
Gitblit v1.8.0