2 files changed, 50 insertions, 0 deletions

diff --git a/lib/dolce/utils/code-translator.ts b/lib/dolce/utils/code-translator.ts
index 19cb4217..f55d0691 100644
--- a/lib/dolce/utils/code-translator.ts
+++ b/lib/dolce/utils/code-translator.ts
@@ -23,6 +23,10 @@ export function translateB3DrawingUsage(code: string, lng: string): string {
       ko: "작업용",
       en: "Working",
     },
+    "CMT": {
+      ko: "Comment",
+      en: "Comment",
+    },
   };
 
   return translations[code]?.[lng] || code;
@@ -47,6 +51,10 @@ export function translateB3RegisterKind(code: string, lng: string): string {
       ko: "작업용 입수도면(Partial)",
       en: "For Working(Partial)",
     },
+    "CMTV": {
+      ko: "Comment",
+      en: "Comment",
+    },
   };
 
   return translations[code]?.[lng] || code;
@@ -63,6 +71,10 @@ export function translateB4DrawingUsage(code: string, lng: string): string {
       ko: "제출용",
       en: "SHI→GTT",
     },
+    "CMT": {
+      ko: "Comment",
+      en: "Comment",
+    },
   };
 
   return translations[code]?.[lng] || code;
@@ -87,6 +99,14 @@ export function translateB4RegisterKind(code: string, lng: string): string {
       ko: "Pre. 제출용(SHI→GTT)",
       en: "Pre. Submission(SHI→GTT)",
     },
+    "CMTM": {
+      ko: "Mark-Up",
+      en: "Mark-Up",
+    },
+    "CMTQ": {
+      ko: "TQ",
+      en: "TQ",
+    },
   };
 
   return translations[code]?.[lng] || code;
@@ -167,6 +187,7 @@ export function getB3DrawingUsageOptions(lng: string) {
   return [
     { value: "APP", label: translateB3DrawingUsage("APP", lng) },
     { value: "WOR", label: translateB3DrawingUsage("WOR", lng) },
+    { value: "CMT", label: translateB3DrawingUsage("CMT", lng) },
   ];
 }
 
@@ -176,6 +197,10 @@ export function getB3RegisterKindOptions(drawingUsage: string, lng: string) {
       { value: "APPR", label: translateB3RegisterKind("APPR", lng) },
       { value: "APPP", label: translateB3RegisterKind("APPP", lng) },
     ];
+  } else if (drawingUsage === "CMT") {
+    return [
+      { value: "CMTV", label: translateB3RegisterKind("CMTV", lng) },
+    ];
   } else if (drawingUsage === "WOR") {
     return [
       { value: "WORK", label: translateB3RegisterKind("WORK", lng) },
@@ -188,6 +213,7 @@ export function getB3RegisterKindOptions(drawingUsage: string, lng: string) {
 export function getB4DrawingUsageOptions(lng: string) {
   return [
     { value: "REC", label: translateB4DrawingUsage("REC", lng) },
+    { value: "CMT", label: translateB4DrawingUsage("CMT", lng) },
   ];
 }
 
@@ -197,6 +223,12 @@ export function getB4RegisterKindOptions(drawingUsage: string, lng: string) {
       { value: "RECP", label: translateB4RegisterKind("RECP", lng) },
       { value: "RECW", label: translateB4RegisterKind("RECW", lng) },
     ];
+  } else if
+  (drawingUsage === "CMT") {
+    return [
+      { value: "CMTM", label: translateB4RegisterKind("CMTM", lng) },
+      { value: "CMTQ", label: translateB4RegisterKind("CMTQ", lng) },
+    ];
   } else if (drawingUsage === "SUB") {
     return [
       { value: "SUBP", label: translateB4RegisterKind("SUBP", lng) },
diff --git a/lib/dolce/utils/date-formatter.ts b/lib/dolce/utils/date-formatter.ts
index 83e78b0d..ebf9653a 100644
--- a/lib/dolce/utils/date-formatter.ts
+++ b/lib/dolce/utils/date-formatter.ts
@@ -6,12 +6,30 @@
  */
 
 import { formatSwpDate } from "@/lib/swp/utils";
+import { format, parseISO, isValid } from "date-fns";
 
 /**
  * SWP와 동일한 방식
+ * Postgres Date 타입(ISO String) 처리 추가
  */
 export function formatDolceDateTime(dateStr: string | null): string {
   if (!dateStr) return "-";
+
+  // ISO string check (e.g. "2023-11-27T10:20:30.000Z" or similar)
+  if (dateStr.includes("-") && (dateStr.includes("T") || dateStr.includes(":"))) {
+    try {
+      const date = parseISO(dateStr);
+      if (isValid(date)) {
+        // Requested format: YYYY-MM-DD AM/PM HH:mm:ss
+        // date-fns format: yyyy-MM-dd a hh:mm:ss
+        return format(date, "yyyy-MM-dd a hh:mm:ss");
+      }
+    } catch (e) {
+      // ignore parse error, fallback to default
+      console.error("Date parse error", e);
+    }
+  }
+
   return formatSwpDate(dateStr);
 }