From 0f407e36564d5aef343fd87921a31b1b416936ff Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 30 Jun 2026 17:42:56 +0900 Subject: [PATCH] =?UTF-8?q?260630=5F01=5FENH:=20=EB=B0=B0=EC=A0=95=20?= =?UTF-8?q?=EB=B0=98=EB=A0=A4=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=ED=9B=84=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/assign/page.tsx | 10 ++++--- src/app/(pages)/(main)/monitoring/page.tsx | 4 +-- src/app/api/assign/[[...slug]]/route.ts | 6 +++++ src/app/api/kon/[[...slug]]/route.ts | 7 +++++ .../dialog/AssignMonitoringDialog.tsx | 27 ++++++++++++------- .../MonitoringPerformanceDetailDialog.tsx | 2 +- src/lib/gwcf/performance-status.ts | 23 ++++++++++++---- src/query/assign.ts | 13 --------- src/types/gwcf.ts | 10 ++++++- 9 files changed, 67 insertions(+), 35 deletions(-) diff --git a/src/app/(pages)/(main)/assign/page.tsx b/src/app/(pages)/(main)/assign/page.tsx index d7c5d84..64f09b7 100644 --- a/src/app/(pages)/(main)/assign/page.tsx +++ b/src/app/(pages)/(main)/assign/page.tsx @@ -11,14 +11,14 @@ import {DataTableColumn} from "@/components/data-table/DataTable.type"; import {SmsSendDialog} from "@/components/dialog/SmsSendDialog"; import {AssignMonitoringDialog} from "@/components/dialog/AssignMonitoringDialog"; import {useCodesQuery} from "@/query/code"; -import {usePerformanceListQuery} from "@/query/performance"; +import {usePerformanceDetailQuery, usePerformanceListQuery} from "@/query/performance"; import { useMonitoringApplyUserCountsQuery, useMonitoringApplyUsersQuery, useSaveMonitoringAssignMutation, } from "@/query/assign"; import {filterPerformance, getCodeLabel} from "@/lib/gwcf/view"; -import {MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status"; +import {isAssignConfirmed, MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status"; import {PerformanceAssign, PerformanceFull} from "@/types/gwcf"; import {useDialog} from "@/hooks/useDialog"; import {useMounted} from "@/hooks/useMounted"; @@ -148,9 +148,11 @@ const AssignPage = () => { {id: "monitoringTime", header: PERFORMANCE_FIELD_LABELS.monitoringTimeInfo, cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""}, {id: "applyCount", header: "신청자 수", accessorFn:((row) => applyCountMap.get(String(row.id)) ?? 0), cell: ({row}) => applyCountMap.get(String(row.original.id)) ?? 0}, {id: "requestCount", header: "확정요청 수", accessorFn:((row) => getMonitoringAssigns(row).length), cell: ({row}) => getMonitoringAssigns(row.original).length}, - {id: "confirmedCount", header: "확정인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter((assign) => assign.assignConfirm ).length), cell: ({row}) => getMonitoringAssigns(row.original).filter((assign) => assign.assignConfirm).length}, + {id: "confirmedCount", header: "확정인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter(isAssignConfirmed).length), cell: ({row}) => getMonitoringAssigns(row.original).filter(isAssignConfirmed).length}, ], [applyCountMap, codes]); + const {data: detailData} = usePerformanceDetailQuery(selected?.id ?? 0, Boolean(selected?.id && assignOpen)); + if(!mounted) return return ( @@ -185,7 +187,7 @@ const AssignPage = () => { hideDialog("assignMonitoringDialog"); refreshAssignList(); }} - selected={selected} + selected={detailData ?? selected} codes={codes} applyUsers={applyUsers} isSavingAssign={saveAssignMutation.isPending} diff --git a/src/app/(pages)/(main)/monitoring/page.tsx b/src/app/(pages)/(main)/monitoring/page.tsx index cc0cc86..f143a2a 100644 --- a/src/app/(pages)/(main)/monitoring/page.tsx +++ b/src/app/(pages)/(main)/monitoring/page.tsx @@ -17,7 +17,7 @@ import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {toLocalDateString} from "@/lib/gwcf/date"; import { - getMonitoringDisplayRow, getMonitoringDisplayStatus, + getMonitoringDisplayRow, getMonitoringDisplayStatus, isAssignConfirmed, } from "@/lib/gwcf/performance-status"; import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels"; import {getCodeLabel} from "@/lib/gwcf/view"; @@ -87,7 +87,7 @@ const MonitoringPage = () => { const assignedItems = useMemo(() => { if (!userId) return []; return data.filter((item) => - item.performanceAssignList?.some((assign) => assign.assignUser === userId && assign.assignConfirm) + item.performanceAssignList?.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign)) ); }, [data, userId]); diff --git a/src/app/api/assign/[[...slug]]/route.ts b/src/app/api/assign/[[...slug]]/route.ts index 52f0713..0e72e19 100644 --- a/src/app/api/assign/[[...slug]]/route.ts +++ b/src/app/api/assign/[[...slug]]/route.ts @@ -57,6 +57,12 @@ export const POST = async ( ); return NextResponse.json(result, { status: 200 }); } + if (action === "reject" && second && third && slug.length === 3) { + const result = await backApi.post( + `/assign/reject/${encodeURIComponent(second)}/${encodeURIComponent(third)}` + ); + return NextResponse.json(result, { status: 200 }); + } if(action === "written" && second === "excel-template"){ const result = await backApi.post( diff --git a/src/app/api/kon/[[...slug]]/route.ts b/src/app/api/kon/[[...slug]]/route.ts index b5d1e32..2518607 100644 --- a/src/app/api/kon/[[...slug]]/route.ts +++ b/src/app/api/kon/[[...slug]]/route.ts @@ -78,6 +78,13 @@ export const POST = async ( return withCors(NextResponse.json(result, { status: 200 })); } + if(action === "assign-reject" && slug.length === 3) { + const result = await backApi.post( + `/assign/reject/${encodeURIComponent(slug[1])}/${encodeURIComponent(slug[2])}` + ); + return withCors(NextResponse.json(result, { status: 200 })); + } + if(action === "performance" && slug.length === 2) { const result = await backApi.get(`/performance/${encodeURIComponent(slug[1])}`) return withCors(NextResponse.json(result, { status: 200 })); diff --git a/src/components/dialog/AssignMonitoringDialog.tsx b/src/components/dialog/AssignMonitoringDialog.tsx index 7610201..9adc108 100644 --- a/src/components/dialog/AssignMonitoringDialog.tsx +++ b/src/components/dialog/AssignMonitoringDialog.tsx @@ -11,7 +11,12 @@ import {StatusPill} from "@/components/gwcf/StatusPill"; import {Code, MonitoringApplyUser, PerformanceFull} from "@/types/gwcf"; import {CodeGroup} from "@/query/code"; import {getCodeLabel, getDetailValue} from "@/lib/gwcf/view"; -import {getAssignStatusDisplay, MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status"; +import { + getAssignStatusDisplay, + isAssignConfirmed, isAssignRejected, + isNotAssignRejected, + MONITORING_ASSIGN_TYPE +} from "@/lib/gwcf/performance-status"; import {PERFORMANCE_FIELD_LABELS, USER_FIELD_LABELS} from "@/lib/gwcf/field-labels"; type CodeMap = Partial>; @@ -49,13 +54,13 @@ export function AssignMonitoringDialog({ return; } - setCheckedIds(monitoringAssigns.map((item) => item.assignUser)); + setCheckedIds(monitoringAssigns.filter(isNotAssignRejected).map((item) => item.assignUser)); }, [monitoringAssigns, open, selected?.id]); const confirmRequestCount = monitoringAssigns.length; - const confirmedCount = monitoringAssigns.filter((item) => item.assignConfirm).length; + const confirmedCount = monitoringAssigns.filter(isAssignConfirmed).length; const assignSmsTargetIds = checkedIds.filter( - (userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && assign.assignConfirm) + (userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign)) ); const updateChecked = (applyUser: MonitoringApplyUser, checked: boolean) => { @@ -69,15 +74,19 @@ export function AssignMonitoringDialog({ return; } + if(isAssignRejected(currentAssign)) { + if (!confirm("이미 포기한 사용자 입니다. 정말로 다시 배정하시겠습니까?")) return; + } + const next = Array.from(new Set([...checkedIds, applyUser.userId])); setCheckedIds(next); return; } - if (currentAssign?.assignConfirm) { - if (!confirm("이미 승인된 상태입니다. 정말로 취소 하시 겠습니까?")) return; - } else if (currentAssign) { - if (!confirm("이미 문자 발송된 상태입니다. 정말로 취소 하시 겠습니까?")) return; + if (isAssignConfirmed(currentAssign)) { + if (!confirm("이미 승인된 상태입니다. 정말로 취소하시겠습니까?")) return; + } else if (isNotAssignRejected(currentAssign) && currentAssign) { + if (!confirm("이미 문자 발송된 상태입니다. 정말로 취소하시겠습니까?")) return; } const next = checkedIds.filter((userId) => userId !== applyUser.userId); @@ -136,7 +145,7 @@ export function AssignMonitoringDialog({ const assigned = monitoringAssigns.find((item) => item.assignUser === row.original.userId); if (!assigned) return null; - const display = getAssignStatusDisplay(assigned.assignConfirm); + const display = getAssignStatusDisplay(assigned.assignStatus); return {display.label}; }, }, diff --git a/src/components/dialog/MonitoringPerformanceDetailDialog.tsx b/src/components/dialog/MonitoringPerformanceDetailDialog.tsx index 4ecad8a..2666a85 100644 --- a/src/components/dialog/MonitoringPerformanceDetailDialog.tsx +++ b/src/components/dialog/MonitoringPerformanceDetailDialog.tsx @@ -240,7 +240,7 @@ export function MonitoringPerformanceDetailDialog({ {performance.performanceMonitoringSchedule?.monitoringDate ?? ""} {performance.performanceMonitoringSchedule?.monitoringTimeInfo} {performance.performanceMonitoringSchedule?.monitoringAddress} - {performance.performanceMemo} + {/*{performance.performanceMemo}*/}
diff --git a/src/lib/gwcf/performance-status.ts b/src/lib/gwcf/performance-status.ts index 3ed5941..bad77e3 100644 --- a/src/lib/gwcf/performance-status.ts +++ b/src/lib/gwcf/performance-status.ts @@ -1,5 +1,6 @@ import {Code, PerformanceAssign, PerformanceFull, PerformanceMonitoringVisit, PerformanceReview, UserCompact} from "@/types/gwcf"; import type {StatusPillVariant} from "@/components/gwcf/StatusPill"; +import {ASSIGN_STATUS, AssignStatus} from "@/types/gwcf"; export const LOCAL_GOVERNMENT_REVIEW_TYPE = 3; export const MONITORING_ASSIGN_TYPE = 1; @@ -49,6 +50,18 @@ export const STATUS_FILTER = { DONE: "-1007", } as const; +export const isAssignConfirmed = (assign?: Pick) => { + return assign?.assignStatus === ASSIGN_STATUS.CONFIRMED; +}; + +export const isAssignRejected = (assign?: Pick) => { + return assign?.assignStatus === ASSIGN_STATUS.REJECTED; +}; + +export const isNotAssignRejected = (assign?: Pick) => { + return assign?.assignStatus !== ASSIGN_STATUS.REJECTED; +}; + export const makeStatusOption = (value: string, label: string): Code => ({ codeGroup: "status_filter", codeValue: Number(value), @@ -94,7 +107,7 @@ const getMonitoringTimeline = (visits: PerformanceMonitoringVisit[]): Monitoring export const getMonitoringSlots = (performance: Partial): [MonitoringSlot, MonitoringSlot] => { const confirmedAssigns = (performance.performanceAssignList ?? []) - .filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE && assign.assignConfirm) + .filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE && isAssignConfirmed(assign)) .sort((a, b) => a.assignOrder - b.assignOrder || a.id - b.id); const visits = performance.performanceMonitoringVisitMap ?? {}; @@ -310,8 +323,8 @@ export const getMonitoringDisplayStatus = ( return getMonitoringStatusDisplay(visitLabel, row.slot); }; -export const getAssignStatusDisplay = (confirmed: boolean): StatusDisplay => { - return confirmed - ? {label: "확정", variant: "done"} - : {label: "요청", variant: "inprogress"}; +export const getAssignStatusDisplay = (status: AssignStatus): StatusDisplay => { + if (status === ASSIGN_STATUS.CONFIRMED) return {label: "확정", variant: "done"}; + if (status === ASSIGN_STATUS.REJECTED) return {label: "포기", variant: "danger"}; + return {label: "요청", variant: "inprogress"}; }; diff --git a/src/query/assign.ts b/src/query/assign.ts index 7d3990a..fa6fa63 100644 --- a/src/query/assign.ts +++ b/src/query/assign.ts @@ -91,19 +91,6 @@ export function useAssignCancelMutation() { }); } -export function useKonAssignConfirmMutation() { - const qc = useQueryClient(); - - return useMutation({ - mutationFn: ({performanceId, userId}: {performanceId: number; userId: string}) => - nextApi.post(`/assign/confirm/${performanceId}/${encodeURIComponent(userId)}`), - onSuccess: (_res, {performanceId, userId}) => { - qc.invalidateQueries({ queryKey: qk.assignConfirm(performanceId, userId) }); - qc.invalidateQueries({ queryKey: ["performance", "list"] }); - }, - }); -} - export function useUploadWrittenAssignExcelMutation() { const qc = useQueryClient(); diff --git a/src/types/gwcf.ts b/src/types/gwcf.ts index 9e55187..236837f 100644 --- a/src/types/gwcf.ts +++ b/src/types/gwcf.ts @@ -26,13 +26,21 @@ export type Code = { memo: string; }; +export const ASSIGN_STATUS = { + REQUESTED: 0, + CONFIRMED: 1, + REJECTED: 9, +} as const; + +export type AssignStatus = typeof ASSIGN_STATUS[keyof typeof ASSIGN_STATUS]; + export type PerformanceAssign = { id: number; performanceId: number; assignType: number; assignOrder: number; assignUser: string; - assignConfirm: boolean; + assignStatus: AssignStatus; }; export type MonitoringApplyUser = {