From bcd462d6e60871b86008e072f4b914138fc5c328 Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Mon, 11 Aug 2025 09:34:40 +0000 Subject: (김준회) 리치텍스트에디터 (결재템플릿을 위한 공통컴포넌트), command-menu 에러 수정, 결재 템플릿 관리, 결재선 관리, ECC RFQ+PR Item 수신시 비즈니스테이블(ProcurementRFQ) 데이터 적재, WSDL 오류 수정 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/knox-api/approval/service.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/knox-api/approval/service.ts') diff --git a/lib/knox-api/approval/service.ts b/lib/knox-api/approval/service.ts index 6ef1b1f6..0bd817a6 100644 --- a/lib/knox-api/approval/service.ts +++ b/lib/knox-api/approval/service.ts @@ -1,7 +1,7 @@ "use server" import db from '@/db/db'; import { ApprovalLine } from "./approval"; -import { approval } from '@/db/schema/knox/approvals'; +import { approvalLogs } from '@/db/schema/knox/approvals'; import { eq, and } from 'drizzle-orm'; // ========== 데이터베이스 서비스 함수들 ========== @@ -21,7 +21,7 @@ export async function saveApprovalToDatabase( aplns: ApprovalLine[] ): Promise { try { - await db.insert(approval).values({ + await db.insert(approvalLogs).values({ apInfId, userId, epId, @@ -51,12 +51,12 @@ export async function updateApprovalStatus( ): Promise { try { await db - .update(approval) + .update(approvalLogs) .set({ status, updatedAt: new Date(), }) - .where(eq(approval.apInfId, apInfId)); + .where(eq(approvalLogs.apInfId, apInfId)); } catch (error) { console.error('결재 상태 업데이트 실패:', error); throw new Error('결재 상태를 업데이트하는 중 오류가 발생했습니다.'); @@ -69,15 +69,15 @@ export async function updateApprovalStatus( export async function getApprovalFromDatabase( apInfId: string, includeDeleted: boolean = false -): Promise { +): Promise { try { const whereCondition = includeDeleted - ? eq(approval.apInfId, apInfId) - : and(eq(approval.apInfId, apInfId), eq(approval.isDeleted, false)); + ? eq(approvalLogs.apInfId, apInfId) + : and(eq(approvalLogs.apInfId, apInfId), eq(approvalLogs.isDeleted, false)); const result = await db .select() - .from(approval) + .from(approvalLogs) .where(whereCondition) .limit(1); @@ -96,17 +96,17 @@ export async function getApprovalsByUser( limit: number = 50, offset: number = 0, includeDeleted: boolean = false -): Promise { +): Promise { try { const whereCondition = includeDeleted - ? eq(approval.userId, userId) - : and(eq(approval.userId, userId), eq(approval.isDeleted, false)); + ? eq(approvalLogs.userId, userId) + : and(eq(approvalLogs.userId, userId), eq(approvalLogs.isDeleted, false)); const result = await db .select() - .from(approval) + .from(approvalLogs) .where(whereCondition) - .orderBy(approval.createdAt) + .orderBy(approvalLogs.createdAt) .limit(limit) .offset(offset); @@ -125,12 +125,12 @@ export async function deleteApprovalFromDatabase( ): Promise { try { await db - .update(approval) + .update(approvalLogs) .set({ isDeleted: true, updatedAt: new Date(), }) - .where(eq(approval.apInfId, apInfId)); + .where(eq(approvalLogs.apInfId, apInfId)); } catch (error) { console.error('결재 데이터 삭제 실패:', error); throw new Error('결재 데이터를 삭제하는 중 오류가 발생했습니다.'); -- cgit v1.2.3