Fixed related to converter util refactoring

Author: XingY

api/src/org/labkey/api/util/SubstitutionFormat.java

@@ -82,8 +82,17 @@ public Object format(Object value)
                 return defaultTimeFormat.format(value);
             else if (value instanceof java.sql.Date)
                 return date.format(value);
-            else if (value instanceof Date)
-                return defaultDateTimeFormat.format(value).replace('T', ' '); // replace T with whitespace for human readability
+            else if (value instanceof Date dateVal)
+            {
+                // both date and datetime column type are of type Date, format based on time portion of the date value
+                LocalDateTime ldt = LocalDateTime.ofInstant(dateVal.toInstant(), ZoneId.systemDefault());
+                boolean isDateOnly = ldt.toLocalTime().equals(java.time.LocalTime.MIDNIGHT);
+
+                if (isDateOnly)
+                    return date.format(value);
+                else
+                    return defaultDateTimeFormat.format(value).replace('T', ' '); // replace T with whitespace for human readability
+            }
 
             return value;
         }

query/src/org/labkey/query/sql/CalculatedExpressionColumn.java

@@ -1,5 +1,6 @@
 package org.labkey.query.sql;
 
+import org.apache.commons.beanutils.ConversionException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.AbstractTableInfo;
@@ -371,6 +372,11 @@ private QExpr getBoundExpression(Map<FieldKey, ColumnInfo> columnMap)
         return _boundExpr;
     }
 
+    @Override
+    public Object convert(Object o) throws ConversionException
+    {
+        return o;
+    }
 
     /*
      * TESTS