|
@@ -358,8 +358,6 @@ public final class ReportParseUtils {
|
|
|
};
|
|
|
} else if (matcher2.find()) {
|
|
|
return matcher2.group();
|
|
|
- } else if (matcher5.find()) {
|
|
|
- return matcher5.group();
|
|
|
} else if (matcher3.find()) {
|
|
|
return matcher3.group(1) + "-12-31";
|
|
|
} else if (matcher6.find()) {
|
|
@@ -369,6 +367,8 @@ public final class ReportParseUtils {
|
|
|
String month = matcher4.group(2);
|
|
|
int lastDayOfMonth = getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month));
|
|
|
return year + "-" + padZero(month) + "-" + padZero(lastDayOfMonth + "");
|
|
|
+ } else if (matcher5.find()) {
|
|
|
+ return matcher5.group();
|
|
|
} else {
|
|
|
return null;
|
|
|
}
|