summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/[lng]/evcp/(evcp)/avl/[id]/page.tsx19
-rw-r--r--app/[lng]/evcp/(evcp)/avl/page.tsx2
2 files changed, 18 insertions, 3 deletions
diff --git a/app/[lng]/evcp/(evcp)/avl/[id]/page.tsx b/app/[lng]/evcp/(evcp)/avl/[id]/page.tsx
index 52ee7b7f..b065919f 100644
--- a/app/[lng]/evcp/(evcp)/avl/[id]/page.tsx
+++ b/app/[lng]/evcp/(evcp)/avl/[id]/page.tsx
@@ -8,6 +8,8 @@ import { getAvlLists, getAvlDetail } from "@/lib/avl/service"
import { avlDetailSearchParamsCache } from "@/lib/avl/validations"
import { AvlDetailTable } from "@/lib/avl/table/avl-detail-table"
import { getAvlListById } from "@/lib/avl/service"
+import { getAllProjectInfoByProjectCode as getProjectInfoFromBiddingProjects } from "@/lib/bidding-projects/service"
+import { getAllProjectInfoByProjectCode as getProjectInfoFromProjects } from "@/lib/projects/service"
interface AvlDetailPageProps {
params: Promise<{ id: string }>
@@ -33,6 +35,16 @@ export default async function AvlDetailPage(props: AvlDetailPageProps) {
notFound()
}
+ // 프로젝트 테이블 먼저
+ let projectInfo = await getProjectInfoFromProjects(avlListInfo.projectCode || '')
+ // 없으면 견적프로젝트 테이블 조회
+ if (!projectInfo) {
+ projectInfo = await getProjectInfoFromBiddingProjects(avlListInfo.projectCode || '')
+ }
+
+ // 배열로 오니 첫번째것만
+ projectInfo = projectInfo[0]
+
const promises = Promise.all([
getAvlDetail({
...search,
@@ -66,6 +78,7 @@ export default async function AvlDetailPage(props: AvlDetailPageProps) {
promises={promises}
avlListId={Number(id)}
avlListInfo={avlListInfo}
+ projectInfo={projectInfo}
/>
</React.Suspense>
</div>
@@ -78,11 +91,13 @@ export default async function AvlDetailPage(props: AvlDetailPageProps) {
function AvlDetailTableWrapper({
promises,
avlListId,
- avlListInfo
+ avlListInfo,
+ projectInfo
}: {
promises: Promise<any>
avlListId: number
avlListInfo: any
+ projectInfo: any
}) {
const [{ data, pageCount }] = React.use(promises)
@@ -98,7 +113,7 @@ function AvlDetailTableWrapper({
pageCount={pageCount}
avlListId={avlListId}
avlType={avlType}
- projectCode={avlListInfo.projectCode}
+ projectInfo={projectInfo}
shipOwnerName={shipOwnerName}
businessType={avlListInfo.constructionSector || '조선'}
/>
diff --git a/app/[lng]/evcp/(evcp)/avl/page.tsx b/app/[lng]/evcp/(evcp)/avl/page.tsx
index a5a5a170..1c345cda 100644
--- a/app/[lng]/evcp/(evcp)/avl/page.tsx
+++ b/app/[lng]/evcp/(evcp)/avl/page.tsx
@@ -19,7 +19,7 @@ async function getInitialAvlData(searchParams: SearchParams) {
// 기본 파라미터로 전체 데이터 조회
const result = await getAvlLists({
page: 1,
- perPage: 100, // 충분한 수량으로 조회
+ perPage: 10, // 충분한 수량으로 조회
sort: [{ id: "createdAt", desc: true }],
flags: [],
filters: validFilters,