1 files changed, 124 insertions, 9 deletions

diff --git a/lib/bidding/service.ts b/lib/bidding/service.ts
index a658ee6a..27dae87d 100644
--- a/lib/bidding/service.ts
+++ b/lib/bidding/service.ts
@@ -18,6 +18,7 @@ import {
     vendorContacts,
     vendors
 } from '@/db/schema'
+import { companyConditionResponses } from '@/db/schema/bidding'
 import {
     eq,
     desc,
@@ -2196,7 +2197,7 @@ export async function updateBiddingProjectInfo(biddingId: number) {
 }
 
 // 입찰의 PR 아이템 금액 합산하여 bidding 업데이트
-async function updateBiddingAmounts(biddingId: number) {
+export async function updateBiddingAmounts(biddingId: number) {
   try {
     // 해당 bidding의 모든 PR 아이템들의 금액 합계 계산
     const amounts = await db
@@ -2214,9 +2215,9 @@ async function updateBiddingAmounts(biddingId: number) {
     await db
       .update(biddings)
       .set({
-        targetPrice: totalTargetAmount,
-        budget: totalBudgetAmount,
-        finalBidPrice: totalActualAmount,
+        targetPrice: String(totalTargetAmount),
+        budget: String(totalBudgetAmount),
+        finalBidPrice: String(totalActualAmount),
         updatedAt: new Date()
       })
       .where(eq(biddings.id, biddingId))
@@ -2511,6 +2512,119 @@ export async function deleteBiddingCompanyContact(contactId: number) {
   }
 }
 
+// 입찰담당자별 입찰 업체 조회
+export async function getBiddingCompaniesByBidPicId(bidPicId: number) {
+  try {
+    const companies = await db
+      .select({
+        biddingId: biddings.id,
+        biddingNumber: biddings.biddingNumber,
+        biddingTitle: biddings.title,
+        companyId: biddingCompanies.companyId,
+        vendorCode: vendors.vendorCode,
+        vendorName: vendors.vendorName,
+        updatedAt: biddings.updatedAt,
+      })
+      .from(biddings)
+      .innerJoin(biddingCompanies, eq(biddings.id, biddingCompanies.biddingId))
+      .innerJoin(vendors, eq(biddingCompanies.companyId, vendors.id))
+      .where(eq(biddings.bidPicId, bidPicId))
+      .orderBy(desc(biddings.updatedAt))
+
+    return {
+      success: true,
+      data: companies
+    }
+  } catch (error) {
+    console.error('Failed to get bidding companies by bidPicId:', error)
+    return {
+      success: false,
+      error: '입찰 업체 조회에 실패했습니다.',
+      data: []
+    }
+  }
+}
+
+// 입찰 업체를 현재 입찰에 추가 (담당자 정보 포함)
+export async function addBiddingCompanyFromOtherBidding(
+  targetBiddingId: number,
+  sourceBiddingId: number,
+  companyId: number,
+  contacts?: Array<{
+    contactName: string
+    contactEmail: string
+    contactNumber?: string
+  }>
+) {
+  try {
+    return await db.transaction(async (tx) => {
+      // 중복 체크
+      const existingCompany = await tx
+        .select()
+        .from(biddingCompanies)
+        .where(
+          and(
+            eq(biddingCompanies.biddingId, targetBiddingId),
+            eq(biddingCompanies.companyId, companyId)
+          )
+        )
+        .limit(1)
+
+      if (existingCompany.length > 0) {
+        return {
+          success: false,
+          error: '이미 등록된 업체입니다.'
+        }
+      }
+
+      // 1. biddingCompanies 레코드 생성
+      const [biddingCompanyResult] = await tx
+        .insert(biddingCompanies)
+        .values({
+          biddingId: targetBiddingId,
+          companyId: companyId,
+          invitationStatus: 'pending',
+          invitedAt: new Date(),
+        })
+        .returning({ id: biddingCompanies.id })
+
+      if (!biddingCompanyResult) {
+        throw new Error('업체 추가에 실패했습니다.')
+      }
+
+      // 2. 담당자 정보 추가
+      if (contacts && contacts.length > 0) {
+        await tx.insert(biddingCompaniesContacts).values(
+          contacts.map(contact => ({
+            biddingId: targetBiddingId,
+            vendorId: companyId,
+            contactName: contact.contactName,
+            contactEmail: contact.contactEmail,
+            contactNumber: contact.contactNumber || null,
+          }))
+        )
+      }
+
+      // 3. company_condition_responses 레코드 생성
+      await tx.insert(companyConditionResponses).values({
+        biddingCompanyId: biddingCompanyResult.id,
+      })
+
+      return {
+        success: true,
+        message: '업체가 성공적으로 추가되었습니다.',
+        data: { id: biddingCompanyResult.id }
+      }
+    })
+  } catch (error) {
+    console.error('Failed to add bidding company from other bidding:', error)
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : '업체 추가에 실패했습니다.'
+    }
+  }
+}
+
 export async function updateBiddingConditions(
   biddingId: number,
   updates: {
@@ -3145,9 +3259,9 @@ export async function increaseRoundOrRebid(biddingId: number, userId: string | u
         }
       }
 
-      revalidatePath('/bidding')
-      revalidatePath(`/bidding/${biddingId}`) // 기존 입찰 페이지도 갱신
-      revalidatePath(`/bidding/${newBidding.id}`)
+      revalidatePath('/bid-receive')
+      revalidatePath(`/bid-receive/${biddingId}`) // 기존 입찰 페이지도 갱신
+      revalidatePath(`/bid-receive/${newBidding.id}`)
 
       return {
         success: true,
@@ -3436,9 +3550,10 @@ export async function getBiddingsForSelection(input: GetBiddingsSchema) {
     // 'bidding_opened', 'bidding_closed', 'evaluation_of_bidding', 'vendor_selected' 상태만 조회
     basicConditions.push(
       or(
-        eq(biddings.status, 'bidding_closed'),
         eq(biddings.status, 'evaluation_of_bidding'),
-        eq(biddings.status, 'vendor_selected')
+        eq(biddings.status, 'vendor_selected'),
+        eq(biddings.status, 'round_increase'),
+        eq(biddings.status, 'rebidding'),
       )!
     )