|
@ -46,6 +46,11 @@ public class DateTimeUtil {
|
|
|
}
|
|
|
|
|
|
public static Date strToDate(String date,DateTimeFormatter dateTimeFormatter){
|
|
|
if(date.length()==10){
|
|
|
LocalDate localDate = LocalDate.parse(date,dateTimeFormatter);
|
|
|
Instant instant = localDate.atStartOfDay(DateUtil.zone).toInstant();
|
|
|
return Date.from(instant);
|
|
|
}
|
|
|
LocalDateTime localDateTime = LocalDateTime.parse(date,dateTimeFormatter);
|
|
|
return DateUtil.localTimeToDate(localDateTime);
|
|
|
}
|