(김준회) 기술영업 조선 RFQ 에러 처리 및 필터와 소팅 처리

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/techsales-rfq/repository.ts b/lib/techsales-rfq/repository.ts
index 8a579427..66c0b345 100644
--- a/lib/techsales-rfq/repository.ts
+++ b/lib/techsales-rfq/repository.ts
@@ -80,7 +80,7 @@ export async function selectTechSalesRfqsWithJoin(
     // RFQ 기본 정보
     id: techSalesRfqs.id,
     rfqCode: techSalesRfqs.rfqCode,
-    itemId: techSalesRfqs.itemId,
+    itemShipbuildingId: techSalesRfqs.itemShipbuildingId,
     itemName: itemShipbuilding.itemList,
     materialCode: techSalesRfqs.materialCode,
     
@@ -132,7 +132,7 @@ export async function selectTechSalesRfqsWithJoin(
     )`,
   })
   .from(techSalesRfqs)
-  .leftJoin(itemShipbuilding, sql`split_part(${techSalesRfqs.materialCode}, ',', 1) = ${itemShipbuilding.itemCode}`)
+  .leftJoin(itemShipbuilding, sql`${techSalesRfqs.itemShipbuildingId} = ${itemShipbuilding.id}`)
   .leftJoin(sql`${users} AS created_user`, sql`${techSalesRfqs.createdBy} = created_user.id`)
   .leftJoin(sql`${users} AS updated_user`, sql`${techSalesRfqs.updatedBy} = updated_user.id`)
   .leftJoin(sql`${users} AS sent_user`, sql`${techSalesRfqs.sentBy} = sent_user.id`);
@@ -159,7 +159,7 @@ export async function countTechSalesRfqsWithJoin(
   const res = await tx
     .select({ count: count() })
     .from(techSalesRfqs)
-    .leftJoin(itemShipbuilding, sql`split_part(${techSalesRfqs.materialCode}, ',', 1) = ${itemShipbuilding.itemCode}`)
+    .leftJoin(itemShipbuilding, sql`${techSalesRfqs.itemShipbuildingId} = ${itemShipbuilding.id}`)
     .where(where ?? undefined);
   return res[0]?.count ?? 0;
 }
@@ -210,7 +210,7 @@ export async function selectTechSalesVendorQuotationsWithJoin(
     
     // 프로젝트 정보
     materialCode: techSalesRfqs.materialCode,
-    itemId: techSalesRfqs.itemId,
+    itemShipbuildingId: techSalesRfqs.itemShipbuildingId,
     itemName: itemShipbuilding.itemList,
     
     // 프로젝트 핵심 정보
@@ -228,7 +228,7 @@ export async function selectTechSalesVendorQuotationsWithJoin(
   .from(techSalesVendorQuotations)
   .leftJoin(techSalesRfqs, sql`${techSalesVendorQuotations.rfqId} = ${techSalesRfqs.id}`)
   .leftJoin(vendors, sql`${techSalesVendorQuotations.vendorId} = ${vendors.id}`)
-  .leftJoin(itemShipbuilding, sql`split_part(${techSalesRfqs.materialCode}, ',', 1) = ${itemShipbuilding.itemCode}`)
+  .leftJoin(itemShipbuilding, sql`${techSalesRfqs.itemShipbuildingId} = ${itemShipbuilding.id}`)
   .leftJoin(sql`${users} AS created_user`, sql`${techSalesVendorQuotations.createdBy} = created_user.id`)
   .leftJoin(sql`${users} AS updated_user`, sql`${techSalesVendorQuotations.updatedBy} = updated_user.id`);
 
@@ -256,7 +256,7 @@ export async function countTechSalesVendorQuotationsWithJoin(
     .from(techSalesVendorQuotations)
     .leftJoin(techSalesRfqs, sql`${techSalesVendorQuotations.rfqId} = ${techSalesRfqs.id}`)
     .leftJoin(vendors, sql`${techSalesVendorQuotations.vendorId} = ${vendors.id}`)
-    .leftJoin(itemShipbuilding, sql`split_part(${techSalesRfqs.materialCode}, ',', 1) = ${itemShipbuilding.itemCode}`)
+    .leftJoin(itemShipbuilding, sql`${techSalesRfqs.itemShipbuildingId} = ${itemShipbuilding.id}`)
     .where(where ?? undefined);
   return res[0]?.count ?? 0;
 }
@@ -286,7 +286,7 @@ export async function selectTechSalesDashboardWithJoin(
     materialCode: techSalesRfqs.materialCode,
     
     // 아이템 정보
-    itemId: techSalesRfqs.itemId,
+    itemShipbuildingId: techSalesRfqs.itemShipbuildingId,
     itemName: itemShipbuilding.itemList,
     
     // 프로젝트 정보
@@ -364,7 +364,7 @@ export async function selectTechSalesDashboardWithJoin(
     createdByName: sql<string>`created_user.name`,
   })
   .from(techSalesRfqs)
-  .leftJoin(itemShipbuilding, sql`split_part(${techSalesRfqs.materialCode}, ',', 1) = ${itemShipbuilding.itemCode}`)
+  .leftJoin(itemShipbuilding, sql`${techSalesRfqs.itemShipbuildingId} = ${itemShipbuilding.id}`)
   .leftJoin(sql`${users} AS created_user`, sql`${techSalesRfqs.createdBy} = created_user.id`);
 
   // where 조건 적용