|
@@ -70,6 +70,14 @@ public class Dateutils {
|
|
|
}
|
|
|
return new Date();
|
|
|
}
|
|
|
+ public static Date getDateTime(String date) {
|
|
|
+ try {
|
|
|
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date);
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return new Date();
|
|
|
+ }
|
|
|
public static Date getMonday(Date date) {
|
|
|
Calendar calBegin = Calendar.getInstance();
|
|
|
calBegin.setTime(date);
|
|
@@ -145,7 +153,7 @@ public class Dateutils {
|
|
|
if(StringUtils.isBlank(startTime)){
|
|
|
return Dateutils.getHalfYearStrDay();
|
|
|
}
|
|
|
- Date date = getDate(startTime);
|
|
|
+ Date date = getDateTime(startTime);
|
|
|
|
|
|
return Dateutils.getDateDay(date);
|
|
|
}
|
|
@@ -154,7 +162,7 @@ public class Dateutils {
|
|
|
return Dateutils.getDateDay(new Date());
|
|
|
}
|
|
|
|
|
|
- Date date = getDate(endTime);
|
|
|
+ Date date = getDateTime(endTime);
|
|
|
|
|
|
return Dateutils.getDateDay(date);
|
|
|
}
|