From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 9af501f..7b313a8 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -92,6 +92,26 @@
/**
+ * @Description: ������������������������������������������������
+ * @Param: [date]
+ * @return: java.util.List<java.util.Date>
+ * @Author: ���������
+ * @Date: 2021/9/8
+ */
+ public static List<Date> dateToStartAndEndTime(Date date){
+ String dateStr = dateToDateString(date, "yyyy-MM-dd");
+ String startDateStr = dateStr+" 00:00:00";
+ String endDateStr = dateStr+" 23:59:59";
+ Date startDate = getDate(startDateStr, "yyyy-MM-dd HH:mm:ss");
+ Date endDate = getDate(endDateStr, "yyyy-MM-dd HH:mm:ss");
+ ArrayList<Date> dates = new ArrayList<>();
+ dates.add(startDate);
+ dates.add(endDate);
+ return dates;
+ }
+
+
+ /**
* @Description: Date���toString������������Date
* @Param: []
* @return: java.util.Date
--
Gitblit v1.8.0