Merge pull request #23 from zhengqiang1988/fix-date-bug

修复DATEDIF不能正确处理10月的问题

Author: toolgood

java/toolgood.algorithm/src/main/java/toolgood/algorithm/MyDate.java

@@ -113,7 +113,7 @@ public MyDate(double num) {
     public static MyDate parse(String txt) {
         String t = txt.trim();
         Matcher m = Pattern
-                .compile("^(\\d{4})-(11|12|0?\\d)-(30|31|[012]?\\d) ([01]\\d?|2[1234]):([012345]?\\d):([012345]?\\d)$")
+                .compile("^(\\d{4})-(10|11|12|0?\\d)-(30|31|[012]?\\d) ([01]\\d?|2[1234]):([012345]?\\d):([012345]?\\d)$")
                 .matcher(t);
         if (m.find()) {
             MyDate date = new MyDate();
@@ -125,7 +125,7 @@ public static MyDate parse(String txt) {
             date.Second = Integer.parseInt(m.group(6));
             return date;
         }
-        m = Pattern.compile("(\\d{4})-(11|12|0?\\d)-(30|31|[012]?\\d) ([01]\\d?|2[1234]):([012345]?\\d)").matcher(t);
+        m = Pattern.compile("(\\d{4})-(10|11|12|0?\\d)-(30|31|[012]?\\d) ([01]\\d?|2[1234]):([012345]?\\d)").matcher(t);
         if (m.find()) {
             MyDate date = new MyDate();
             date.Year = Integer.parseInt(m.group(1));
@@ -135,7 +135,7 @@ public static MyDate parse(String txt) {
             date.Minute = Integer.parseInt(m.group(5));
             return date;
         }
-        m = Pattern.compile("(\\d{4})-(11|12|0?\\d)-(30|31|[012]?\\d)").matcher(t);
+        m = Pattern.compile("(\\d{4})-(10|11|12|0?\\d)-(30|31|[012]?\\d)").matcher(t);
         if (m.find()) {
             MyDate date = new MyDate();
             date.Year = Integer.parseInt(m.group(1));

java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest_dateTime.java

@@ -192,6 +192,14 @@ public void DATEDIF_Test()
         dt = engine.TryEvaluate("DATEDIF('1975-1-30','2017-1-7','d')", 0);
         assertEquals(dt, 15318);
 
+        dt = engine.TryEvaluate("DATEDIF('2023-9-30','2023-10-2','d')", 0);
+        assertEquals(dt, 2);
+
+        dt = engine.TryEvaluate("DATEDIF('2023-9-30 11:25','2023-10-2 00:01','d')", 0);
+        assertEquals(dt, 1);
+
+        dt = engine.TryEvaluate("DATEDIF('2023-9-30 11:25:45','2023-10-2 00:01:16','d')", 0);
+        assertEquals(dt, 1);
 
         dt = engine.TryEvaluate("DATEDIF('1975-1-30','2017-1-7','yd')", 0);
         assertEquals(dt, 342);