瀏覽代碼

fix:调整报告日期识别的规则顺序

wangzaijun 1 月之前
父節點
當前提交
b54e639018
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mo-daq/src/main/java/com/smppw/modaq/application/components/ReportParseUtils.java

+ 2 - 2
mo-daq/src/main/java/com/smppw/modaq/application/components/ReportParseUtils.java

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