diff --git a/apps/as/src/entities/sewer-bsc-plan/api/sewer-bsc-plan-service.ts b/apps/as/src/entities/sewer-bsc-plan/api/sewer-bsc-plan-service.ts index 62aced93b..c8c0b298b 100644 --- a/apps/as/src/entities/sewer-bsc-plan/api/sewer-bsc-plan-service.ts +++ b/apps/as/src/entities/sewer-bsc-plan/api/sewer-bsc-plan-service.ts @@ -26,8 +26,8 @@ async function findPage( return response.data; } -async function findById(sewerBscPlanDocNo: string): Promise { - const response = await client.get(`${BASE}/${sewerBscPlanDocNo}`); +async function findById(sewerBscPlanDocNo: string): Promise { + const response = await client.get(`${BASE}/${sewerBscPlanDocNo}`); return response.data; } diff --git a/apps/as/src/entities/sewer-bsc-plan/model/sewer-bsc-plan-interface.ts b/apps/as/src/entities/sewer-bsc-plan/model/sewer-bsc-plan-interface.ts index 1ef4abb5c..0bab9d6f0 100644 --- a/apps/as/src/entities/sewer-bsc-plan/model/sewer-bsc-plan-interface.ts +++ b/apps/as/src/entities/sewer-bsc-plan/model/sewer-bsc-plan-interface.ts @@ -207,7 +207,7 @@ export interface SewerBscPlanDetResponseDto { /** Controller public 메서드명·시그니처와 동일 */ export interface SewerBscPlanService { findPage(params: SewerBscPlanSearchRequestDto): Promise>; - findById(sewerBscPlanDocNo: string): Promise; + findById(sewerBscPlanDocNo: string): Promise; save(body: SewerBscPlanSaveRequestDto): Promise; update( sewerBscPlanDocNo: string, diff --git a/apps/as/src/pages/nti-hstry/ui/nti-hstry-list.tsx b/apps/as/src/pages/nti-hstry/ui/nti-hstry-list.tsx index 7eaf63f11..be270e2d3 100644 --- a/apps/as/src/pages/nti-hstry/ui/nti-hstry-list.tsx +++ b/apps/as/src/pages/nti-hstry/ui/nti-hstry-list.tsx @@ -61,9 +61,11 @@ function NtiHstryList({ searchParams, pagination, onPaginationChange }: NtiHstry const handleAction = useCallback( async (row: NotiAsUserResponseDto) => { - await readNoti(row.notiId); + if (row.notReadYn === "N") await readNoti(row.notiId); + const notiUrl = resolveNotiUrl(row); if (!notiUrl) return; + router.push(notiUrl); }, [readNoti, router], diff --git a/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-detail-gate.tsx b/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-detail-gate.tsx index c5f6f4a44..22e4ffdd5 100644 --- a/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-detail-gate.tsx +++ b/apps/as/src/pages/sewer-bsc-plan/ui/sewer-bsc-plan-detail-gate.tsx @@ -13,14 +13,14 @@ interface SewerBscPlanDetailGateProps { function SewerBscPlanDetailGate({ id, propChgCycl }: SewerBscPlanDetailGateProps) { const userInfo = useUserStore((state) => state.userInfo); - const chgCycl = propChgCycl ?? 1; const { data, isLoading, isError } = useSewerBscPlan(id); const shouldRedirectToEdit = canEditPbadmsDoc({ docSeComCd: "SEWER", - prgrsSttsComCd: data?.prgrsSttsComCd, - rgtr: data?.rgtr, + prgrsSttsComCd: data?.detDto?.prgrsSttsComCd, + rgtr: data?.detDto?.rgtr, loggedInUserUnqId: userInfo?.userUnqId, }); + const chgCycl = propChgCycl ?? data?.activeDtlDto?.chgCycl; return ( - + ); }