|
@@ -56,14 +56,14 @@ public class DateUtil {
|
|
|
public static Date getDatetimeAfterCentury(Date date) {
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.setTime(date);
|
|
|
- calendar.set(2000,Calendar.DECEMBER,31, calendar.get(Calendar.HOUR_OF_DAY),
|
|
|
+ calendar.set(2000, Calendar.DECEMBER, 31, calendar.get(Calendar.HOUR_OF_DAY),
|
|
|
calendar.get(Calendar.MINUTE), calendar.get(Calendar.SECOND));
|
|
|
return calendar.getTime();
|
|
|
}
|
|
|
|
|
|
- public static String calculateAge(Date birthDate) {
|
|
|
+ public static Integer calculateAge(Date birthDate) {
|
|
|
if (null == birthDate) {
|
|
|
- return "";
|
|
|
+ return null;
|
|
|
}
|
|
|
int age;
|
|
|
Calendar cal = Calendar.getInstance();
|
|
@@ -89,6 +89,6 @@ public class DateUtil {
|
|
|
age--;
|
|
|
}
|
|
|
}
|
|
|
- return String.valueOf(age);
|
|
|
+ return age;
|
|
|
}
|
|
|
}
|