From 8944fa8f819587d927a59cd76cd8cfbff9fe8d6f Mon Sep 17 00:00:00 2001 From: leedj312 Date: Wed, 9 Jul 2025 14:47:47 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B1=B4=EC=B6=95=EB=AC=BC=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/prfmncReg/pbnstPrfmncReg/index.tsx | 4 --- .../ruseFcltMng/fcltReg/htdflReg/index.tsx | 8 +++--- .../ruseFcltMng/fcltReg/rswtReg/index.tsx | 8 +++--- .../ruseFcltMng/fcltSttn/pbnstSttn/index.tsx | 25 +++++++++++++------ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx index eea31c334..17c73c363 100644 --- a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx +++ b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx @@ -42,9 +42,7 @@ type pbnstPrfmncActions = { }; const checkWrRegList = async (year:string) => { - let url =`/reuseFc/pubDetailList` - if(year&& year.length>0){ // url+=`/${year}` } @@ -58,8 +56,6 @@ const hasuListFetch = async (page: number, sggOrCity: string , year:string,searc checkWrRegListRes?.fcltCds, fetchType.COMMON ); - - let findData = rainRes.data.map((item: pubHasuType) => { const data = checkWrRegListRes?.fcPrfList.find( (fclt: FcPrfType) => diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx index b241fe7f1..9c5d8e215 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx @@ -175,7 +175,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( const chData = await makeMdfr(data); const res = await putFectch("/drain/facility", chData); if (res.status) { - toast.success("온배수 건축물 수정이 완료되었습니다."); + toast.success("온배수 시설물 수정이 완료되었습니다."); } const htdflRes = await getFetchWithCount( "wr", @@ -191,7 +191,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( }, })); } catch (errorUpdate) { - toast.error("온배수 건축물 수정 오류입니다.."); + toast.error("온배수 시설물 수정 오류입니다.."); } }, htdflBdstReg: async (data: customHtdflBdst, code: string | number) => { @@ -202,7 +202,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( const chData = makeRstr(data); const res = await postFectch("/drain/facility", chData); if (res.status ===200) { - toast.success("온배수 건축물 등록이 완료되었습니다."); + toast.success("온배수 시설 등록이 완료되었습니다."); } const htdflRes = await initFetch(String(code)); set((state: htdflFacState) => ({ @@ -215,7 +215,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( }, })); } catch (errorReg) { - toast.error("온배수 건축물 등록 오류입니다.."); + toast.error("온배수 시설물 등록 오류입니다.."); } },htdflNmSearch :async(code:string | number, fcltNm:string) =>{ diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx index e969c7405..99ba724ad 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx @@ -196,15 +196,15 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = ( if(chch.status ===200) { console.log('chch.status' , chch.status) - toast.success("건축물 및 증축/개축/중축 등록이 완료되었습니다."); + toast.success("건축물(중수도) 및 증축/개축/중축 등록이 완료되었습니다."); }else{ - toast.error("건축물 증축/개축/중축 오류입니다."); + toast.error("건축물(중수도 증축/개축/중축 오류입니다."); } } else { - toast.success("건축물 등록이 완료되었습니다."); + toast.success("건축물(중수도 등록이 완료되었습니다."); } }else{ - toast.error("건축물 등록이 완료되었습니다."); + toast.error("건축물(중수도) 등록이 완료하였습니다."); } const rswtRes = await initFetch(code); set((state: rswtFacState) => ({ diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index f54eb5cbd..24f94dc58 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -59,7 +59,8 @@ type pbnstSttnActions = { total: string, reurnValue: ReturnType, searchNm: string | undefined, - year: string + year: string, + flcts:string[] ) => void; }; @@ -109,9 +110,7 @@ const hasuListFetch = async ( }/0/1/SW` } else if( reurnValue.partValue === 'G'){ - console.log('reurnValue.sigunValue ', reurnValue.sidoValue) - console.log('reurnValue.sigunValue ', reurnValue.sigunValue) url += `${page}/${total}/${reurnValue.envPartValue}/${reurnValue.sigunValue !== '0' ? reurnValue.sigunValue : reurnValue.sidoValue}/0/1/SW` }else{ @@ -121,6 +120,8 @@ const hasuListFetch = async ( if (searchNm && searchNm?.length > 0) { url += "/" + searchNm } + + console.log(' flcts ' ,flcts) const pbnList = await postFectch(url, flcts,fetchType.COMMON); const getRuseList = await postFectch( `/reuseFc/pubDetailList/${year}`, @@ -130,12 +131,16 @@ const hasuListFetch = async ( const checkWrRegListRes = getRuseList.data; const count = getRuseList.count; + + const data: WaterReuseFacility[] = checkWrRegListRes.map( (item: FcPrfType) => { const findData = pbnList.data.find( (fclt: pubHasuType) => fclt.bscFctCd === item.pbnstRuseFcltPk.substring(0, 11) ); + + console.log(' pbnList ', pbnList) if(findData){ const usage = item.prfList.reduce( @@ -163,7 +168,7 @@ const hasuListFetch = async ( }, { total: 0, inUsage: 0, outUsage: 0 } ); - + console.log('findData ', findData) return { rvbsn: findData?.rvbsn ||'-', lgbsn: findData?.lgbsn||'-', @@ -196,6 +201,10 @@ const hasuListFetch = async ( } ).filter(Boolean); + + console.log( ' checkWrRegListRes ', getRuseList.data) + console.log( ' data ', data) + return data; }; @@ -292,7 +301,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( year, fclts ); - + console.log('pbnstSttnRes ' , pbnstSttnRes) set( (state: pbnstSttnState) => { return { ...state, @@ -332,7 +341,8 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( total: string, reurnValue: ReturnType, searchNm: string | undefined, - year: string + year: string, + flcts:string[] ) => { try { @@ -341,7 +351,8 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( total, reurnValue, searchNm, - year + year, + flcts ); set((state: pbnstSttnState) => {