260812_01_ENH: 배정·진행 현황 개선 및 예약/이벤트 이력 기능 추가

- 프로젝트별 외주사·필드워커 배정 현황 및 미배정 건수 UI 추가
- 현장 면접 진행 여부와 사용자 권한에 따른 배정 탭·필터·컬럼 노출 제어
- 컨택 마지막 이벤트 일자 필터·정렬 및 결과/일자 컬럼 분리
- 컨택·면접·발송 현황의 날짜 범위 선택 optional 처리
- 진행 현황의 미배정 표시 및 일자별 미사용 결과 제외
- 전역 예약 기간 조회·이동 및 5분 단위 예약 알림 추가
- 내부 관리자용 이벤트 이력 단건 삭제 기능 추가
- 리스트 필터 UI 및 일반 헤더 정렬 기준 개선
- 프로젝트 저장 시 선택 프로젝트 정보 동기화
This commit is contained in:
2026-08-12 08:41:27 +09:00
parent e8f3308814
commit 081b53945a
34 changed files with 852 additions and 331 deletions

View File

@@ -2,15 +2,27 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { nextApi } from "@/lib/http-client";
import { qk } from "@/query/key/keys";
import type { ListAssignRequest, ListAssignResetRequest } from "@/types/list";
const invalidateAssignSummaries = (qc: ReturnType<typeof useQueryClient>, prjctIdx: number) =>
Promise.all([
qc.invalidateQueries({ queryKey: qk.projectAssignCmpnSummary(prjctIdx) }),
qc.invalidateQueries({ queryKey: ["assign", "prjct-fieldwork-summary", prjctIdx] }),
]);
export function useUpsertListAssignMutation(prjctIdx: number) {
const qc = useQueryClient();
return useMutation({
mutationFn: ({ assignId, request }: { assignId: string; request: ListAssignRequest }) =>
nextApi.put<number>(`/assign/list/${prjctIdx}/${encodeURIComponent(assignId)}`, request),
onSuccess: () => qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
onSuccess: async () => {
await Promise.all([
qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
invalidateAssignSummaries(qc, prjctIdx),
]);
},
});
}
@@ -20,6 +32,11 @@ export function useResetListAssignMutation(prjctIdx: number) {
return useMutation({
mutationFn: (request: ListAssignResetRequest) =>
nextApi.del<number>(`/assign/list/reset/${prjctIdx}`, { json: request }),
onSuccess: () => qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
onSuccess: async () => {
await Promise.all([
qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
invalidateAssignSummaries(qc, prjctIdx),
]);
},
});
}

View File

@@ -30,6 +30,9 @@ export const qk = {
/********** 배정 관련 **********/
projectAssignFieldwork: (prjctIdx: number) => ["assign", "prjct-fieldwork", prjctIdx] as const,
projectAssignCmpn: (prjctIdx: number) => ["assign", "prjct-cmpn", prjctIdx] as const,
projectAssignCmpnSummary: (prjctIdx: number) => ["assign", "prjct-cmpn-summary", prjctIdx] as const,
projectAssignFieldworkSummary: (prjctIdx: number, assignType: number, cmpnIds: string[]) =>
["assign", "prjct-fieldwork-summary", prjctIdx, assignType, [...cmpnIds].sort()] as const,
/********** 배정 관련 **********/
/********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/
@@ -58,9 +61,13 @@ export const qk = {
listEventHistory: (prjctIdx: number, sid: string) => ["list", "event-history", prjctIdx, sid] as const,
listUpdateHistory: (prjctIdx: number, sid: string) => ["list", "update-history", prjctIdx, sid] as const,
listReserveBySid: (prjctIdx: number, sid: string) => ["list", "reserve", "sid", prjctIdx, sid] as const,
listReserveByUser: (prjctIdx: number, userId: string) => ["list", "reserve", "user", prjctIdx, userId] as const,
/********** 리스트 관련 **********/
/********** 예약 알림 관련 **********/
reserveSearch: (userId: string, fromDt: string, toDt: string) =>
["reserve", "search", userId, fromDt, toDt] as const,
/********** 예약 알림 관련 **********/
/********** 템플릿 및 발송 관련 **********/
mainTemplate: (prjctIdx: number, chnnlTy: ChannelType) =>
["project", "main-template", prjctIdx, chnnlTy] as const,

View File

@@ -52,6 +52,9 @@ const serializeListSearchRequest = (request: ListSearchRequest) => ({
[ResultCodeType.INTERVIEW]: [],
},
surveyResultConditions: request.listFilter.surveyResultConditions ?? [],
...(request.listFilter.lastEventDateRange?.length
? { lastEventDateRange: request.listFilter.lastEventDateRange }
: {}),
memoConditions: request.listFilter.memoConditions ?? [],
otherItemConditions: request.listFilter.otherItemConditions ?? [],
},
@@ -122,26 +125,15 @@ export function useListReserveBySidQuery(prjctIdx: number, sid: string, enabled:
});
}
export function useListReserveByUserQuery(prjctIdx: number, userId: string, enabled: boolean) {
return useQuery({
queryKey: qk.listReserveByUser(prjctIdx, userId),
queryFn: () => nextApi.get<ListReserve[]>(`/reserve/user/${prjctIdx}/${userId}`),
enabled,
staleTime: 0,
refetchOnMount: "always",
meta: { ignoreGlobalLoading: true },
});
}
export function useReserveMutation(prjctIdx: number, sid: string) {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (request: ListReserveRequest) => nextApi.put<ListReserve>(`/reserve`, request),
onSuccess: async (_result, request) => {
onSuccess: async () => {
await Promise.all([
queryClient.invalidateQueries({ queryKey: qk.listReserveBySid(prjctIdx, sid) }),
queryClient.invalidateQueries({ queryKey: qk.listReserveByUser(prjctIdx, request.userId) }),
queryClient.invalidateQueries({ queryKey: ["reserve", "search"] }),
]);
},
});
@@ -260,6 +252,20 @@ export function useAddListEventMutation(prjctIdx: number, sid: string) {
});
}
export function useDeleteListEventMutation(prjctIdx: number, sid: string) {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (listEventHistIdx: number) => nextApi.del<void>(`/list-hist/event/${listEventHistIdx}`),
onSuccess: async () => {
await Promise.all([
queryClient.invalidateQueries({ queryKey: qk.listDetail(prjctIdx, sid) }),
queryClient.invalidateQueries({ queryKey: qk.listEventHistory(prjctIdx, sid) }),
]);
},
});
}
export function useDownloadListMutation(prjctIdx: number) {
return useMutation({
mutationFn: (listFilter: ListFilter) =>

View File

@@ -11,6 +11,7 @@ import type {
ProjectListRequest,
ProjectOwnerResponse, ProjectUpdateRequest, ResultCode
} from "@/types/project";
import type { ListHeaderAssignType, ProjectCompanyAssignSummary, ProjectFieldworkAssignSummary } from "@/types/list";
import type { PageRequest, PageResponse } from "@kri/common";
export function useProjectOwnerListQuery(enabled: boolean = true) {
@@ -166,6 +167,41 @@ export function useAssignedFieldworkIdsQuery(prjctIdx: number, enabled: boolean)
});
}
/**
* 프로젝트의 외주사별 배정 현황(총 개수/미배정 개수/외주사별 배정 개수)
*/
export function useAssignedCmpnSummaryQuery(prjctIdx: number, enabled: boolean) {
return useQuery({
queryKey: qk.projectAssignCmpnSummary(prjctIdx),
queryFn: () => nextApi.get<ProjectCompanyAssignSummary>(`/assign/prjct-cmpn-summary/${prjctIdx}`),
enabled,
staleTime: 0,
refetchOnMount: "always",
});
}
/**
* 프로젝트의 컨택원/면접원별 배정 현황(총 개수/미배정 개수/사람별 배정 개수)
* cmpnIds를 지정하면 해당 외주사 소속 인원 범위로 카운트가 재계산된다(외주사 계정은 서버에서 본인 회사로 강제됨).
*/
export function useAssignedFieldworkSummaryQuery(
prjctIdx: number,
assignType: ListHeaderAssignType,
cmpnIds: string[],
enabled: boolean,
) {
return useQuery({
queryKey: qk.projectAssignFieldworkSummary(prjctIdx, assignType, cmpnIds),
queryFn: () => {
const query = `?assignType=${assignType}${cmpnIds.length > 0 ? `&cmpnIds=${cmpnIds.join(",")}` : ""}`;
return nextApi.get<ProjectFieldworkAssignSummary>(`/assign/prjct-fieldwork-summary/${prjctIdx}${query}`);
},
enabled,
staleTime: 0,
refetchOnMount: "always",
});
}
export function useCreateProjectMutation() {
const qc = useQueryClient();

30
src/query/reserve.ts Normal file
View File

@@ -0,0 +1,30 @@
"use client";
import { useQuery } from "@tanstack/react-query";
import { nextApi } from "@/lib/http-client";
import { qk } from "@/query/key/keys";
import type { ListReserve } from "@/types/list";
/**
* 헤더의 예약 조회 다이얼로그용: 전체 프로젝트 대상, 날짜 range로 조회.
*/
export function useReserveSearchQuery(userId: string, fromDt: string, toDt: string, enabled: boolean) {
return useQuery({
queryKey: qk.reserveSearch(userId, fromDt, toDt),
queryFn: () =>
nextApi.get<ListReserve[]>(`/reserve/user/${encodeURIComponent(userId)}/search?fromDt=${fromDt}&toDt=${toDt}`),
enabled,
staleTime: 0,
refetchOnMount: "always",
meta: { ignoreGlobalLoading: true },
});
}
/**
* 5분 정각 폴링용: react-query 캐시 없이 그때그때 호출한다(useReserveNotification 훅 전용).
*/
export function fetchReserveNotifications(userId: string, requestPast: boolean) {
return nextApi.get<ListReserve[]>(
`/reserve/user/${encodeURIComponent(userId)}?requestPast=${requestPast}`,
);
}