修改

Author: linzhijun

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

@@ -4,6 +4,8 @@
 import org.joda.time.DateTimeZone;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -232,11 +234,16 @@ public String toString() {
     }
 
     public String toString(String f) {
-        return null;
-        // if (Year == null) {
-        // return ((DateTime) this).ToString(f);
-        // }
-        // return ((DateTime) this).ToString(f);
+        Date date;
+        if (Year != null && Year > 1900) {
+            date = new Date(Year, Month, Day, Hour, Minute, Second);
+        }else if (Day != null){
+            date = new Date(1900, 1, Day, Hour, Minute, Second);
+        }else{
+            date = new Date(1900, 1, 0, Hour, Minute, Second);
+        }
+        SimpleDateFormat sd = new SimpleDateFormat(f);
+        return sd.format(date);
     }
 
     public DateTime ToDateTime() {
@@ -275,112 +282,45 @@ public MyDate AddSeconds(int d) {
         return new MyDate(ToDateTime().plusSeconds(d));
     }
 
-    // public static implicit operator
-
-    // Date(DateTime date) {
-    // return new Date(date);
-    // }
-
-    // public static implicit operator
-
-    // DateTime(Date date)
-    // {
-    // return new DateTime(date.Year ?? 0, date.Month ?? 0, date.Day ?? 0,
-    // date.Hour, date.Minute, date.Second);
-    // }
-
-    // public static implicit operator
-
-    // TimeSpan(Date date)
-    // {
-    // return new TimeSpan(date.Day ?? 0, date.Hour, date.Minute, date.Second);
-    // }
-
-    // public static implicit operator
-
-    // Date(double days) {
-    // var dt = DateTime.MinValue.AddDays((int) days);
-    // if (dt.Year > 1900) {
-    // dt = dt.AddSeconds((days - (int) days) * 24 * 60 * 60);
-    // return new Date(dt);
-    // }
-    // var day = (int) days;
-    // days = (days - day) * 24;
-    // var hour = (int) days;
-    // days = (days - hour) * 60;
-    // var minute = (int) days * 24;
-    // days = (days - minute) * 60;
-    // var second = (int) days;
-    // return new Date(new TimeSpan(day, hour, minute, second));
-    // }
+    public BigDecimal ToNumber() {
+        BigDecimal result = new BigDecimal(Second).divide(new BigDecimal(60), MathContext.DECIMAL32);
+        result = result.add(new BigDecimal(Minute)).divide(new BigDecimal(60), MathContext.DECIMAL32);
+        result = result.add(new BigDecimal(Hour)).divide(new BigDecimal(24), MathContext.DECIMAL32);
 
-    public double ToNumber() {
         if (Year != null && Year > 1900) {
             LocalDate start = LocalDate.of(Year, Month, Day);
             LocalDate end = LocalDate.of(1900, 1, 1);
             long days = ChronoUnit.DAYS.between(end, start) + 2;
-            return days + (Hour + (Minute + Second / 60.0) / 60) / 24;
+            return result.add(new BigDecimal(days));
         }
         if (Day != null) {
-            return Day + (Hour + (Minute + Second / 60.0) / 60) / 24;
+            return result.add(new BigDecimal(Day));
         }
-        return (Hour + (Minute + Second / 60.0) / 60) / 24;
+        return result;
     }
 
-    // public static implicit operator double(
-    // Date date)
-    // {
-    // if (date.Year > 1900) {
-    // var dt = new DateTime((date.Year ?? 0), (date.Month ?? 0), (date.Day ?? 0),
-    // date.Hour, date.Minute, date.Second);
-    // double days = (double)(dt - DateTime.MinValue).TotalDays;
-    // days += (date.Hour + (date.Minute + date.Second / 60.0) / 60) / 24;
-    // return days;
-    // }
-    // return (date.Day ?? 0) + (date.Hour + (date.Minute + date.Second / 60.0) /
-    // 60) / 24;
-    // }
-
     public MyDate ADD(MyDate num) {
-        return new MyDate(this.ToNumber() + num.ToNumber());
-    }
-
-    public MyDate ADD(Double num) {
-        return new MyDate(this.ToNumber() + num);
+        return new MyDate(this.ToNumber().add(num.ToNumber()));
     }
 
     public MyDate SUB(MyDate num) {
-        return new MyDate(this.ToNumber() - num.ToNumber());
-    }
-
-    public MyDate SUB(Double num) {
-        return new MyDate(this.ToNumber() - num);
-    }
-
-    public MyDate MUL(Double num) {
-        return new MyDate(this.ToNumber() * num);
+        return new MyDate(this.ToNumber().subtract(num.ToNumber()));
     }
 
-    public MyDate DIV(Double num) {
-        return new MyDate(this.ToNumber() / num);
-    }
-
-
     public MyDate ADD(BigDecimal num) {
-        return new MyDate(this.ToNumber() + num.doubleValue());
+        return new MyDate(this.ToNumber().add(num));
     }
 
-
     public MyDate SUB(BigDecimal num) {
-        return new MyDate(this.ToNumber() - num.doubleValue());
+        return new MyDate(this.ToNumber().subtract(num));
     }
 
     public MyDate MUL(BigDecimal num) {
-        return new MyDate(this.ToNumber() * num.doubleValue());
+        return new MyDate(this.ToNumber().multiply(num));
     }
 
     public MyDate DIV(BigDecimal num) {
-        return new MyDate(this.ToNumber() / num.doubleValue());
+        return new MyDate(this.ToNumber().divide(num, MathContext.DECIMAL32));
     }
 
 

java/toolgood.algorithm/src/main/java/toolgood/algorithm/Operand.java

@@ -282,7 +282,7 @@ public Operand ToNumber(String errorMessage) {
 
         @Override
         public Operand ToBoolean(String errorMessage) {
-            return (((double) DateValue().ToNumber()) != 0) ? True : False;
+            return ((DateValue().ToNumber().compareTo(new BigDecimal(0))) != 0) ? True : False;
         }
 
         @Override

java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/MathVisitor.java

@@ -2577,7 +2577,7 @@ public Operand visitDATEDIF_fun(final DATEDIF_funContext context) {
                 return Operand.Create((endDate.Year * 12 + endDate.Month - startDate.Year * 12 - startDate.Month - 1));
             }
         } else if (CharUtil.Equals(t, "d")) {
-            return Operand.Create((int) endDate.SUB(startDate).ToNumber());
+            return Operand.Create(endDate.SUB(startDate).ToNumber().intValue());
         } else if (CharUtil.Equals(t, "yd")) {
             int day = endDate.DayOfYear() - startDate.DayOfYear();
             if (endDate.Year > startDate.Year && day < 0) {