From 72a7673549148fc9cbfa7a618ec4e4915ae13d5a Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 16 Dec 2018 22:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/excel/ExcelCsv.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java
index b3350b737..2caf96bba 100644
--- a/src/main/java/com/nis/util/excel/ExcelCsv.java
+++ b/src/main/java/com/nis/util/excel/ExcelCsv.java
@@ -412,13 +412,18 @@ public class ExcelCsv {
 	    public static boolean isDate(String strDate) {
 	        Pattern pattern = Pattern
 	                .compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
-	        Matcher m = pattern.matcher(strDate);
-	        if (m.matches()) {
-	            return true;
-	        } else {
-	            return false;
+	        if(strDate.length()>= 10){
+	        	 String date=strDate.trim().substring(0, 10);
+	        	 Matcher m = pattern.matcher(date);
+	 	        if (m.matches()) {
+	 	            return true;
+	 	        } else {
+	 	            return false;
+	 	        }
+	        }else{
+	        	return false;
 	        }
+	       
 	    }
-	    
 
 }
\ No newline at end of file