瀏覽代碼

修改日期判断大小

konghl 4 年之前
父節點
當前提交
9f21258c38
共有 1 個文件被更改,包括 7 次插入13 次删除
  1. 7 13
      indoor-service/src/main/java/com/ai/bss/location/util/DateUtil.java

+ 7 - 13
indoor-service/src/main/java/com/ai/bss/location/util/DateUtil.java

@ -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
	/**