From ed864fa46c7ce0aac2de4c5ba5d311ebfd7e6a88 Mon Sep 17 00:00:00 2001
From: dujinkim <dujin.kim@dtsolution.co.kr>
Date: Thu, 15 May 2025 01:34:49 +0000
Subject: (대표님) 벤더 문서 관련 개발사항
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../[formId]/[projectId]/[contractId]/page.tsx     | 78 ++++++++++++++++++++++
 .../vendor-data/form/[packageId]/[formId]/page.tsx | 58 ----------------
 2 files changed, 78 insertions(+), 58 deletions(-)
 create mode 100644 app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/[projectId]/[contractId]/page.tsx
 delete mode 100644 app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/page.tsx

(limited to 'app')

diff --git a/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/[projectId]/[contractId]/page.tsx b/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/[projectId]/[contractId]/page.tsx
new file mode 100644
index 00000000..71a02ab3
--- /dev/null
+++ b/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/[projectId]/[contractId]/page.tsx
@@ -0,0 +1,78 @@
+import DynamicTable from "@/components/form-data/form-data-table";
+import { findContractItemId, getFormData, getFormId } from "@/lib/forms/services";
+
+interface IndexPageProps {
+  params: {
+    lng: string;
+    packageId: string;
+    formId: string;
+    projectId: string;
+    contractId: string;
+
+
+  };
+  searchParams?: {
+    mode?: string;
+  };
+}
+
+export default async function FormPage({ params, searchParams }: IndexPageProps) {
+  // 1) 구조 분해 할당
+  const resolvedParams = await params;
+  
+  // 2) searchParams도 await 필요
+  const resolvedSearchParams = await searchParams;
+  
+  // 3) 구조 분해 할당
+  const { lng, packageId, formId: formCode, projectId,contractId } = resolvedParams;
+  
+  // URL 쿼리 파라미터에서 mode 가져오기 (await 해서 사용)
+  const mode = resolvedSearchParams?.mode === "ENG" ? "ENG" : "IM"; // 기본값은 IM
+  
+  // 4) 변환
+  let packageIdAsNumber = Number(packageId);
+  const contractIdAsNumber = Number(contractId);
+  
+  // packageId가 0이면 contractId와 formCode로 실제 contractItemId 찾기
+  if (packageIdAsNumber === 0 && contractIdAsNumber > 0) {
+    console.log(`packageId가 0이므로 contractId ${contractIdAsNumber}와 formCode ${formCode}로 contractItemId 조회`);
+    
+    const foundContractItemId = await findContractItemId(contractIdAsNumber, formCode);
+    
+    if (foundContractItemId) {
+      console.log(`contractItemId ${foundContractItemId}를 찾았습니다. 이 값을 사용합니다.`);
+      packageIdAsNumber = foundContractItemId;
+    } else {
+      console.warn(`contractItemId를 찾을 수 없습니다. packageId는 계속 0으로 유지됩니다.`);
+    }
+  }
+  
+  // 5) DB 조회
+  const { columns, data } = await getFormData(formCode, packageIdAsNumber);
+
+  
+  // 6) formId 및 report temp file 조회
+  const { formId } = await getFormId(String(packageIdAsNumber), formCode);
+  
+  // 7) 예외 처리
+  if (!columns) {
+    return (
+      <p className="text-red-500">해당 폼의 메타 정보를 불러올 수 없습니다.</p>
+    );
+  }
+  
+  // 8) 렌더링
+  return (
+    <div className="space-y-6">
+      <DynamicTable
+        contractItemId={packageIdAsNumber}
+        formCode={formCode}
+        formId={formId}
+        columnsJSON={columns}
+        dataJSON={data}
+        projectId={Number(projectId)}
+        mode={mode} // 모드 전달
+      />
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/page.tsx b/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/page.tsx
deleted file mode 100644
index dc8df262..00000000
--- a/app/[lng]/partners/(partners)/vendor-data/form/[packageId]/[formId]/page.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import DynamicTable from "@/components/form-data/form-data-table";
-import { getFormData, getFormId } from "@/lib/forms/services";
-
-interface IndexPageProps {
-  params: {
-    lng: string;
-    packageId: string;
-    formId: string;
-  };
-  searchParams?: {
-    mode?: string;
-  };
-}
-
-export default async function FormPage({ params, searchParams }: IndexPageProps) {
-  // 1) 구조 분해 할당
-  const resolvedParams = await params;
-  
-  // 2) searchParams도 await 필요
-  const resolvedSearchParams = await searchParams;
-  
-  // 3) 구조 분해 할당
-  const { lng, packageId, formId: formCode } = resolvedParams;
-  
-  // URL 쿼리 파라미터에서 mode 가져오기 (await 해서 사용)
-  const mode = resolvedSearchParams?.mode === "ENG" ? "ENG" : "IM"; // 기본값은 IM
-  
-  // 4) 변환
-  const packageIdAsNumber = Number(packageId);
-  
-  // 5) DB 조회
-  const { columns, data, projectId } = await getFormData(formCode, packageIdAsNumber);
-  
-  // 6) formId 및 report temp file 조회
-  const { formId } = await getFormId(packageId, formCode);
-  
-  // 7) 예외 처리
-  if (!columns) {
-    return (
-      <p className="text-red-500">해당 폼의 메타 정보를 불러올 수 없습니다.</p>
-    );
-  }
-  
-  // 8) 렌더링
-  return (
-    <div className="space-y-6">
-      <DynamicTable
-        contractItemId={packageIdAsNumber}
-        formCode={formCode}
-        formId={formId}
-        columnsJSON={columns}
-        dataJSON={data}
-        projectId={projectId}
-        mode={mode} // 모드 전달
-      />
-    </div>
-  );
-}
\ No newline at end of file
-- 
cgit v1.2.3