|
@ -161,22 +161,16 @@ public class DateUtil {
|
161
|
161
|
* @throws Exception
|
162
|
162
|
*/
|
163
|
163
|
public static int compareDate(String dateStr0, String dateStr1) throws Exception {
|
164
|
|
if (dateStr0 == null || "".equals(dateStr0)) {
|
165
|
|
if (dateStr1 == null || "".equals(dateStr1)) {
|
166
|
|
return 0;
|
167
|
|
} else {
|
168
|
|
return -1;
|
169
|
|
}
|
170
|
|
}
|
|
164
|
Date date0 = convertDate(dateStr0);
|
|
165
|
Date date1 = convertDate(dateStr1);
|
|
166
|
|
|
167
|
if (date0 == null)
|
|
168
|
return (date1 == null) ? 0 : -1;
|
171
|
169
|
|
172
|
|
if (dateStr1 == null || "".equals(dateStr1)) {
|
|
170
|
if (date1 == null)
|
173
|
171
|
return 1;
|
174
|
|
}
|
175
|
172
|
|
176
|
|
Date date1 = convertDate(dateStr0);
|
177
|
|
Date date2 = convertDate(dateStr1);
|
178
|
|
int result = date1.compareTo(date2);
|
179
|
|
return result;
|
|
173
|
return date0.compareTo(date1);
|
180
|
174
|
}
|
181
|
175
|
|
182
|
176
|
/**
|