|
@@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.regex.Matcher;
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
|
|
public class LuckySheet4SummaryHelp {
|
|
|
|
|
@@ -106,6 +108,13 @@ public class LuckySheet4SummaryHelp {
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
String dateValue = obj.getString(dateKey);
|
|
|
+
|
|
|
+ if(ObjectUtil.isEmpty(dateValue)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ dateValue = fillZeroDateValue(dateValue);
|
|
|
+
|
|
|
try {
|
|
|
DateTime dateTime = DateUtil.parse(dateValue, getDateFormat(dateValue));
|
|
|
return dateTime;
|
|
@@ -117,6 +126,26 @@ public class LuckySheet4SummaryHelp {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 日期补0
|
|
|
+ *
|
|
|
+ * @param dateVal
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static String fillZeroDateValue(String dateVal) {
|
|
|
+ Pattern pattern = Pattern.compile("\\d+");
|
|
|
+ Matcher matcher = pattern.matcher(dateVal);
|
|
|
+
|
|
|
+ while (matcher.find()) {
|
|
|
+ String group = matcher.group();
|
|
|
+ if(Integer.valueOf(group) < 10 && group.length() < 2) {
|
|
|
+ dateVal = dateVal.replace(group, "0".concat(group));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return dateVal;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 获取匹配符
|
|
|
*
|