|
@@ -183,8 +183,9 @@ public class DatesUtil {
|
|
// 获取某个日期的开始时间
|
|
// 获取某个日期的开始时间
|
|
public static Timestamp getDayStartTime(Date d) {
|
|
public static Timestamp getDayStartTime(Date d) {
|
|
Calendar calendar = Calendar.getInstance();
|
|
Calendar calendar = Calendar.getInstance();
|
|
- if (null != d)
|
|
|
|
|
|
+ if (null != d) {
|
|
calendar.setTime(d);
|
|
calendar.setTime(d);
|
|
|
|
+ }
|
|
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
|
|
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
|
|
calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
|
|
calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
|
|
calendar.set(Calendar.MILLISECOND, 0);
|
|
calendar.set(Calendar.MILLISECOND, 0);
|
|
@@ -194,8 +195,9 @@ public class DatesUtil {
|
|
// 获取某个日期的结束时间
|
|
// 获取某个日期的结束时间
|
|
public static Timestamp getDayEndTime(Date d) {
|
|
public static Timestamp getDayEndTime(Date d) {
|
|
Calendar calendar = Calendar.getInstance();
|
|
Calendar calendar = Calendar.getInstance();
|
|
- if (null != d)
|
|
|
|
|
|
+ if (null != d) {
|
|
calendar.setTime(d);
|
|
calendar.setTime(d);
|
|
|
|
+ }
|
|
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
|
|
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH),
|
|
calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
|
|
calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
|
|
calendar.set(Calendar.MILLISECOND, 999);
|
|
calendar.set(Calendar.MILLISECOND, 999);
|
|
@@ -607,7 +609,7 @@ public class DatesUtil {
|
|
return instant.atZone(zoneId).toLocalDate();
|
|
return instant.atZone(zoneId).toLocalDate();
|
|
}
|
|
}
|
|
|
|
|
|
- public static LocalDate parseLocalDate(String date){
|
|
|
|
|
|
+ public static LocalDate formatLocalDate(String date){
|
|
DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
return LocalDate.parse(date, fmt);
|
|
return LocalDate.parse(date, fmt);
|
|
}
|
|
}
|