(김준회) Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 25 insertions, 14 deletions

diff --git a/lib/basic-contract/status-detail/basic-contracts-detail-columns.tsx b/lib/basic-contract/status-detail/basic-contracts-detail-columns.tsx
index aab808b8..de6ba1a9 100644
--- a/lib/basic-contract/status-detail/basic-contracts-detail-columns.tsx
+++ b/lib/basic-contract/status-detail/basic-contracts-detail-columns.tsx
@@ -553,8 +553,8 @@ export function getDetailColumns({
       minSize: 130,
     },
     
-    // 법무검토 상태
-    {
+    // 법무검토 상태 (준법서약 템플릿이 아닐 때만 표시)
+    ...(!isComplianceTemplate ? [{
       accessorKey: "legalReviewStatus",
       header: ({ column }) => (
         <DataTableColumnHeaderSimple column={column} title="법무검토 상태" />
@@ -571,7 +571,30 @@ export function getDetailColumns({
         return <div className="text-sm text-gray-400">-</div>
       },
       minSize: 140,
+    }] : []),
+    
+    // 준법문의 상태 (준법서약 템플릿일 때만 표시)
+    ...(isComplianceTemplate ? [{
+      accessorKey: "complianceReviewStatus",
+      header: ({ column }) => (
+        <DataTableColumnHeaderSimple column={column} title="준법문의 상태" />
+      ),
+      cell: ({ row }) => {
+        const status = row.getValue("complianceReviewStatus") as string | null
+
+        // PRGS_STAT_DSC 연동값 우선 표시
+        if (status) {
+          return <div className="text-sm text-gray-800">{status}</div>
+        }
+
+        // 동기화된 값이 없으면 빈 값 처리
+        return <div className="text-sm text-gray-400">-</div>
+      },
+      minSize: 140,
     },
+    // Red Flag 컬럼들 (준법서약 템플릿일 때만 표시)
+    redFlagColumn,
+    redFlagResolutionColumn] : []),
     
     // 계약완료일
     {
@@ -659,17 +682,5 @@ export function getDetailColumns({
     actionsColumn,
   ]
 
-  // 준법서약 템플릿인 경우 Red Flag 컬럼과 해제 컬럼을 법무검토 상태 뒤에 추가
-  if (isComplianceTemplate) {
-    const legalReviewStatusIndex = baseColumns.findIndex((col) => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return (col as any).accessorKey === 'legalReviewStatus'
-    })
-    
-    if (legalReviewStatusIndex !== -1) {
-      baseColumns.splice(legalReviewStatusIndex + 1, 0, redFlagColumn, redFlagResolutionColumn)
-    }
-  }
-
   return baseColumns
 }
\ No newline at end of file