diff options
Diffstat (limited to 'lib/evaluation')
| -rw-r--r-- | lib/evaluation/service.ts | 18 | ||||
| -rw-r--r-- | lib/evaluation/table/evaluation-columns.tsx | 1 | ||||
| -rw-r--r-- | lib/evaluation/table/evaluation-filter-sheet.tsx | 14 | ||||
| -rw-r--r-- | lib/evaluation/table/evaluation-table.tsx | 1 | ||||
| -rw-r--r-- | lib/evaluation/table/periodic-evaluation-action-dialogs.tsx | 2 | ||||
| -rw-r--r-- | lib/evaluation/table/periodic-evaluations-toolbar-actions.tsx | 2 |
6 files changed, 26 insertions, 12 deletions
diff --git a/lib/evaluation/service.ts b/lib/evaluation/service.ts index 8e394f88..3e85b4a2 100644 --- a/lib/evaluation/service.ts +++ b/lib/evaluation/service.ts @@ -136,7 +136,6 @@ export async function getPeriodicEvaluations(input: GetEvaluationTargetsSchema) const pageCount = Math.ceil(total / input.perPage); - console.log(periodicEvaluationsData, "periodicEvaluationsData") return { data: periodicEvaluationsData, pageCount, total }; } catch (err) { @@ -359,6 +358,20 @@ export async function requestDocumentsFromVendors(data: RequestDocumentsData[]) }) ) + // periodic_evaluations 테이블의 status를 PENDING_SUBMISSION으로 업데이트 + const periodicEvaluationIds = [...new Set(data.map(item => item.periodicEvaluationId))] + + await Promise.all( + periodicEvaluationIds.map(async (periodicEvaluationId) => { + await db + .update(periodicEvaluations) + .set({ + status: 'PENDING_SUBMISSION', + updatedAt: new Date() + }) + .where(eq(periodicEvaluations.id, periodicEvaluationId)) + }) + ) return { success: true, @@ -375,7 +388,6 @@ export async function requestDocumentsFromVendors(data: RequestDocumentsData[]) } } } - // 기존 요청 상태 확인 함수 추가 export async function checkExistingSubmissions(periodicEvaluationIds: number[]) { try { @@ -397,6 +409,8 @@ export async function checkExistingSubmissions(periodicEvaluationIds: number[]) } }) + console.log(existingSubmissions, "existingSubmissions") + return existingSubmissions } catch (error) { console.error("Error checking existing submissions:", error) diff --git a/lib/evaluation/table/evaluation-columns.tsx b/lib/evaluation/table/evaluation-columns.tsx index 315ec66b..dca19ddb 100644 --- a/lib/evaluation/table/evaluation-columns.tsx +++ b/lib/evaluation/table/evaluation-columns.tsx @@ -40,6 +40,7 @@ const getStatusBadgeVariant = (status: string) => { const getStatusLabel = (status: string) => { const statusMap = { + PENDING: "대상확정", PENDING_SUBMISSION: "자료접수중", SUBMITTED: "제출완료", IN_REVIEW: "평가중", diff --git a/lib/evaluation/table/evaluation-filter-sheet.tsx b/lib/evaluation/table/evaluation-filter-sheet.tsx index 7c1e93d8..7f4de6a6 100644 --- a/lib/evaluation/table/evaluation-filter-sheet.tsx +++ b/lib/evaluation/table/evaluation-filter-sheet.tsx @@ -67,11 +67,12 @@ const divisionOptions = [ ] const statusOptions = [ - { value: "PENDING_SUBMISSION", label: "제출대기" }, + { value: "PENDING", label: "대상확정" }, + { value: "PENDING_SUBMISSION", label: "자료접수중" }, { value: "SUBMITTED", label: "제출완료" }, - { value: "IN_REVIEW", label: "검토중" }, - { value: "REVIEW_COMPLETED", label: "검토완료" }, - { value: "FINALIZED", label: "최종확정" }, + { value: "IN_REVIEW", label: "평가중" }, + { value: "REVIEW_COMPLETED", label: "평가완료" }, + { value: "FINALIZED", label: "결과확정" }, ] const domesticForeignOptions = [ @@ -91,7 +92,6 @@ const documentsSubmittedOptions = [ ] const gradeOptions = [ - { value: "S", label: "S등급" }, { value: "A", label: "A등급" }, { value: "B", label: "B등급" }, { value: "C", label: "C등급" }, @@ -470,7 +470,7 @@ export function PeriodicEvaluationFilterSheet({ /> {/* 평가기간 */} - <FormField + {/* <FormField control={form.control} name="evaluationPeriod" render={({ field }) => ( @@ -514,7 +514,7 @@ export function PeriodicEvaluationFilterSheet({ <FormMessage /> </FormItem> )} - /> + /> */} {/* 구분 */} <FormField diff --git a/lib/evaluation/table/evaluation-table.tsx b/lib/evaluation/table/evaluation-table.tsx index 0a5db3cb..d4510eb5 100644 --- a/lib/evaluation/table/evaluation-table.tsx +++ b/lib/evaluation/table/evaluation-table.tsx @@ -224,7 +224,6 @@ export function PeriodicEvaluationsTable({ promises, evaluationYear, className } const [promiseData] = React.use(promises) const tableData = promiseData - console.log(tableData) const getSearchParam = React.useCallback((key: string, defaultValue?: string): string => { return searchParams?.get(key) ?? defaultValue ?? ""; diff --git a/lib/evaluation/table/periodic-evaluation-action-dialogs.tsx b/lib/evaluation/table/periodic-evaluation-action-dialogs.tsx index fc07aea1..e6eec53a 100644 --- a/lib/evaluation/table/periodic-evaluation-action-dialogs.tsx +++ b/lib/evaluation/table/periodic-evaluation-action-dialogs.tsx @@ -82,7 +82,7 @@ export function RequestDocumentsDialog({ // 제출대기 상태인 평가들만 필터링 const pendingEvaluations = React.useMemo(() => - evaluations.filter(e => e.status === "PENDING_SUBMISSION"), + evaluations.filter(e => e.status === "PENDING_SUBMISSION" ||e.status === "PENDING" ), [evaluations] ) diff --git a/lib/evaluation/table/periodic-evaluations-toolbar-actions.tsx b/lib/evaluation/table/periodic-evaluations-toolbar-actions.tsx index d910f916..38622af4 100644 --- a/lib/evaluation/table/periodic-evaluations-toolbar-actions.tsx +++ b/lib/evaluation/table/periodic-evaluations-toolbar-actions.tsx @@ -66,7 +66,7 @@ export function PeriodicEvaluationsTableToolbarActions({ .getFilteredSelectedRowModel() .rows .map(row => row.original) - .filter(e => e.status === "PENDING_SUBMISSION"); + .filter(e => e.status === "PENDING_SUBMISSION"||e.status === "PENDING"); }, [table.getFilteredSelectedRowModel().rows]); const submittedEvaluations = React.useMemo(() => { |