From 93b37e99e6b0bd4e1e7d3775c2b7803e76c74efa Mon Sep 17 00:00:00 2001
From: leeheejin <imleesinok@gmail.com>
Date: Mon, 15 Dec 2025 13:46:42 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EA=B0=84=EC=AA=BD=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=EB=90=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/dashboard/widgets/ListWidget.tsx    | 14 +++++++++++--
 .../dashboard/widgets/ListTestWidget.tsx      | 14 +++++++++++--
 .../dashboard/widgets/MapTestWidgetV2.tsx     | 20 +++++++++----------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/frontend/components/admin/dashboard/widgets/ListWidget.tsx b/frontend/components/admin/dashboard/widgets/ListWidget.tsx
index fbf55750..194f7210 100644
--- a/frontend/components/admin/dashboard/widgets/ListWidget.tsx
+++ b/frontend/components/admin/dashboard/widgets/ListWidget.tsx
@@ -148,9 +148,19 @@ export function ListWidget({ element, onConfigUpdate }: ListWidgetProps) {
 
     switch (format) {
       case "date":
-        return new Date(value).toLocaleDateString("ko-KR");
+        try {
+          const dateVal = new Date(value);
+          return dateVal.toLocaleDateString("ko-KR", { timeZone: "Asia/Seoul" });
+        } catch {
+          return String(value);
+        }
       case "datetime":
-        return new Date(value).toLocaleString("ko-KR");
+        try {
+          const dateVal = new Date(value);
+          return dateVal.toLocaleString("ko-KR", { timeZone: "Asia/Seoul" });
+        } catch {
+          return String(value);
+        }
       case "number":
         return Number(value).toLocaleString("ko-KR");
       case "currency":
diff --git a/frontend/components/dashboard/widgets/ListTestWidget.tsx b/frontend/components/dashboard/widgets/ListTestWidget.tsx
index bc6b3299..d1303d10 100644
--- a/frontend/components/dashboard/widgets/ListTestWidget.tsx
+++ b/frontend/components/dashboard/widgets/ListTestWidget.tsx
@@ -180,9 +180,19 @@ export function ListTestWidget({ element }: ListTestWidgetProps) {
 
     switch (format) {
       case "date":
-        return new Date(value).toLocaleDateString("ko-KR");
+        try {
+          const dateVal = new Date(value);
+          return dateVal.toLocaleDateString("ko-KR", { timeZone: "Asia/Seoul" });
+        } catch {
+          return String(value);
+        }
       case "datetime":
-        return new Date(value).toLocaleString("ko-KR");
+        try {
+          const dateVal = new Date(value);
+          return dateVal.toLocaleString("ko-KR", { timeZone: "Asia/Seoul" });
+        } catch {
+          return String(value);
+        }
       case "number":
         return Number(value).toLocaleString("ko-KR");
       case "currency":
diff --git a/frontend/components/dashboard/widgets/MapTestWidgetV2.tsx b/frontend/components/dashboard/widgets/MapTestWidgetV2.tsx
index b3c9e2fb..151c7eff 100644
--- a/frontend/components/dashboard/widgets/MapTestWidgetV2.tsx
+++ b/frontend/components/dashboard/widgets/MapTestWidgetV2.tsx
@@ -203,14 +203,14 @@ export default function MapTestWidgetV2({ element }: MapTestWidgetV2Props) {
     setTripInfoLoading(identifier);
 
     try {
-      // user_id 또는 vehicle_number로 조회 (시간은 KST로 변환)
+      // user_id 또는 vehicle_number로 조회 (TIMESTAMPTZ는 변환 불필요)
       const query = `SELECT 
         id, vehicle_number, user_id,
-        (last_trip_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_start,
-        (last_trip_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_end,
+        last_trip_start,
+        last_trip_end,
         last_trip_distance, last_trip_time,
-        (last_empty_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_start,
-        (last_empty_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_end,
+        last_empty_start,
+        last_empty_end,
         last_empty_distance, last_empty_time,
         departure, arrival, status
       FROM vehicles 
@@ -281,15 +281,15 @@ export default function MapTestWidgetV2({ element }: MapTestWidgetV2Props) {
     if (identifiers.length === 0) return;
 
     try {
-      // 모든 마커의 운행/공차 정보를 한 번에 조회 (시간은 KST로 변환)
+      // 모든 마커의 운행/공차 정보를 한 번에 조회 (TIMESTAMPTZ는 변환 불필요)
       const placeholders = identifiers.map((_, i) => `$${i + 1}`).join(", ");
       const query = `SELECT 
         id, vehicle_number, user_id,
-        (last_trip_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_start,
-        (last_trip_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_trip_end,
+        last_trip_start,
+        last_trip_end,
         last_trip_distance, last_trip_time,
-        (last_empty_start AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_start,
-        (last_empty_end AT TIME ZONE 'Asia/Seoul')::timestamp as last_empty_end,
+        last_empty_start,
+        last_empty_end,
         last_empty_distance, last_empty_time,
         departure, arrival, status
       FROM vehicles 
-- 
2.43.0