From 77e2bb86da020d15e834d8c3a7e0887fa77dc97a Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" Date: Mon, 4 Dec 2023 17:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0jira=20=E5=A4=84=E7=90=86=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/vcs/ui/FileVersionDialog.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java index 8216ad573..f023b6b92 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java @@ -25,6 +25,7 @@ import java.awt.Frame; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -32,6 +33,8 @@ import java.util.List; public class FileVersionDialog extends UIDialog { public static final long DELAY = 24 * 60 * 60 * 1000L; + private static final int LAST_HOUR_OF_DAY = 23; + private static final int LAST_MINUTE = 59; private UIButton okBtn; private UIButton cancelBtn; private DateEditor dateEditor; @@ -66,7 +69,7 @@ public class FileVersionDialog extends UIDialog { FileVersionDialog.this.setVisible(false); Date editorDate = dateEditor.getValue(); Date start = editorDate == null ? new Date(0) : editorDate; - Date end = editorDate == null ? DateUtils.getLastHour() : new Date(start.getTime() + DELAY); + Date end = editorDate == null ? getLastHour() : new Date(start.getTime() + DELAY); List vcsEntities = WorkContext.getCurrent().get(VcsOperator.class).getFilterVersions(fileName, start, end, textField.getText()); FileVersionTable.getInstance().updateModel(1, vcsEntities); @@ -109,4 +112,18 @@ public class FileVersionDialog extends UIDialog { } + /** + * 获取当天 23 点 59 分 59 秒 + * //todo 兼容 + * + * @return 日期 + */ + private static Date getLastHour() { + Calendar date = Calendar.getInstance(); + date.set(Calendar.HOUR_OF_DAY, LAST_HOUR_OF_DAY); + date.set(Calendar.MINUTE, LAST_MINUTE); + date.set(Calendar.SECOND, LAST_MINUTE); + return date.getTime(); + } + }