Merge pull request #74 from jumpserver/pr@v3@feat_format_timestamp_field

feat: format datetime field
jumpserver · Jan 2, 2025 · 7624871 · 7624871
2 parents 7981372 + 1eb47eb
commit 7624871
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java
@@ -194,14 +194,14 @@ public void export(String scope) throws SQLException {
                 writer.newLine();
 
                 for (List<Object> row : result.getData()) {
-                    for (Object o : row) {
-                        if (o == null) {
-                            writer.write("NULL");
-                            writer.write(",");
+                    for (Object obj : row) {
+                        if (obj instanceof Date) {
+                            SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            writeString(writer, fmt.format(obj));
                         } else {
-                            writer.write(o.toString());
-                            writer.write(",");
+                            writeString(writer, obj);
                         }
+                        writer.write(",");
                     }
                     writer.newLine();
                 }