|
|
@@ -80,6 +80,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
|
|
|
|
|
|
import java.io.*;
|
|
|
import java.net.URL;
|
|
|
+import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.List;
|
|
|
import java.util.*;
|
|
|
@@ -1507,16 +1508,28 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
|
|
|
String myData = DataInfo.get(val) + "";
|
|
|
if ((myData.indexOf("T") >= 0 && myData.indexOf("-") >= 0) || (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0)) {
|
|
|
+
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
|
|
|
sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
|
|
|
SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
+
|
|
|
if (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0) {
|
|
|
|
|
|
myData = myData.replace("[", "").replace("]", "").replaceAll("'", "");
|
|
|
String[] dataVal = myData.split(",");
|
|
|
-
|
|
|
- Date Start_dataStr = sdf.parse(dataVal[0]);
|
|
|
- Date end_dataStr = sdf.parse(dataVal[1]);
|
|
|
+ Date Start_dataStr = new Date();
|
|
|
+ Date end_dataStr = new Date();
|
|
|
+ try {
|
|
|
+ if(myData.indexOf("T") >= 0 && myData.indexOf("-") >= 0){
|
|
|
+ Start_dataStr = sdf.parse(dataVal[0]);
|
|
|
+ end_dataStr = sdf.parse(dataVal[1]);
|
|
|
+ }else{
|
|
|
+ Start_dataStr = formatStr.parse(dataVal[0]);
|
|
|
+ end_dataStr = formatStr.parse(dataVal[1]);
|
|
|
+ }
|
|
|
+ }catch (ParseException e){
|
|
|
+ throw new ServiceException("日期绑定错误");
|
|
|
+ }
|
|
|
String StartDate = formatStr.format(Start_dataStr);
|
|
|
String endDate = formatStr.format(end_dataStr);
|
|
|
if (StartDate.equals(endDate)) {
|
qianxb