Merge remote-tracking branch 'origin/sec-patch' into table-v2

1 files changed, 12 insertions, 6 deletions

diff --git a/lib/bidding/approval-actions.ts b/lib/bidding/approval-actions.ts
index 3d07d49c..b4f6f297 100644
--- a/lib/bidding/approval-actions.ts
+++ b/lib/bidding/approval-actions.ts
@@ -81,6 +81,7 @@ export async function prepareBiddingApprovalData(data: {
       projectName: biddings.projectName,
       itemName: biddings.itemName,
       biddingType: biddings.biddingType,
+      awardCount: biddings.awardCount,
       bidPicName: biddings.bidPicName,
       supplyPicName: biddings.supplyPicName,
       submissionStartDate: biddings.submissionStartDate,
@@ -166,6 +167,7 @@ export async function prepareBiddingApprovalData(data: {
       ...bidding,
       projectName: bidding.projectName || undefined,
       itemName: bidding.itemName || undefined,
+      awardCount: bidding.awardCount || undefined,
       bidPicName: bidding.bidPicName || undefined,
       supplyPicName: bidding.supplyPicName || undefined,
       targetPrice: bidding.targetPrice ? Number(bidding.targetPrice) : undefined,
@@ -264,12 +266,14 @@ export async function requestBiddingInvitationWithApproval(data: {
   const { default: db } = await import('@/db/db');
   const { biddings, biddingCompanies, prItemsForBidding } = await import('@/db/schema');
   const { eq } = await import('drizzle-orm');
-
+  const { getUserNameById } = await import('@/lib/bidding/actions');
+  const userName = await getUserNameById(data.currentUser.id.toString());
+  
   await db
     .update(biddings)
     .set({
       status: 'approval_pending', // 결재 진행중 상태
-      updatedBy: String(data.currentUser.id), // id를 string으로 변환
+      updatedBy: userName,
       updatedAt: new Date()
     })
     .where(eq(biddings.id, data.biddingId));
@@ -463,6 +467,7 @@ export async function requestBiddingClosureWithApproval(data: {
   const { default: db } = await import('@/db/db');
   const { biddings } = await import('@/db/schema');
   const { eq } = await import('drizzle-orm');
+  const { getUserNameById } = await import('@/lib/bidding/actions');
 
   // 유찰상태인지 확인
   const biddingResult = await db
@@ -485,12 +490,12 @@ export async function requestBiddingClosureWithApproval(data: {
 
   // 3. 입찰 상태를 결재 진행중으로 변경
   debugLog('[BiddingClosureApproval] 입찰 상태 변경 시작');
-
+  const userName = await getUserNameById(data.currentUser.id.toString());
   await db
     .update(biddings)
     .set({
       status: 'approval_pending', // 폐찰 결재 진행중 상태
-      updatedBy: Number(data.currentUser.id),
+      updatedBy: userName,
       updatedAt: new Date()
     })
     .where(eq(biddings.id, data.biddingId));
@@ -691,12 +696,13 @@ export async function requestBiddingAwardWithApproval(data: {
   const { default: db } = await import('@/db/db');
   const { biddings } = await import('@/db/schema');
   const { eq } = await import('drizzle-orm');
-
+  const { getUserNameById } = await import('@/lib/bidding/actions');
+  const userName = await getUserNameById(data.currentUser.id.toString());
   await db
     .update(biddings)
     .set({
       status: 'approval_pending', // 낙찰 결재 진행중 상태
-      updatedBy: Number(data.currentUser.id),
+      updatedBy: userName,
       updatedAt: new Date()
     })
     .where(eq(biddings.id, data.biddingId));