diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx index 338ac71f9..50f0afeea 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/pbnstSttn/page.tsx @@ -33,6 +33,7 @@ export default function PbnstSttn() { getFlcts } = useWrStore((state) => state); + const { pbnstSttnRes, fclts,pbnstSttnResCount} =pbnstSttn const ref = useRef({} as ReturnType); const [searchYear, setSearchYear] = useState( String(new Date().getFullYear()) @@ -49,21 +50,21 @@ export default function PbnstSttn() { const [pbnRuseNm, setPbnRuseNm] = useState(""); const excelClick = useCallback(() => { - pbnstSttnSearch(true, String(pageNation), "20", ref.current, "", searchYear); - }, [pbnstSttnSearch]); + pbnstSttnSearch(true, String(pageNation), "100000", ref.current, pbnRuseNm, searchYear,fclts ); + }, [pbnstSttnSearch,fclts,pbnRuseNm]); const cellCLick = useCallback( (index: number | undefined) => { if ( index !== undefined && - pbnstSttn.pbnstSttnRes && - pbnstSttn.pbnstSttnRes[index] + pbnstSttnRes && + pbnstSttnRes[index] ) { - const pbnstRuseFcltPk = pbnstSttn.pbnstSttnRes[index].pbnstRuseFcltPk; + const pbnstRuseFcltPk = pbnstSttnRes[index].pbnstRuseFcltPk; getPbnStnDetail(pbnstRuseFcltPk); } }, - [getPbnStnDetail, pbnstSttn.pbnstSttnRes] + [getPbnStnDetail, pbnstSttnRes] ); useEffect(() => { @@ -72,7 +73,8 @@ export default function PbnstSttn() { pbnstSttn.excelList, "하수재이용시설 현황", "sample_pbnstSttn.xlsx", - "A1:U2" + "A1:U2", + 3 ); } }, [pbnstSttn.excelList]); @@ -83,27 +85,16 @@ export default function PbnstSttn() { } }, [pbnstSttn.isInit, pbnSttnInit, ref.current]); useEffect(() => { - - console.log('pbnstSttn.pbnstSttnRes ' ,pbnstSttn.pbnstSttnRes ) - setBdstTable(pbnstSttn.pbnstSttnRes); - }, [pbnstSttn.pbnstSttnRes]); + if(pbnstSttnRes && pbnstSttnRes.length>0) { + setBdstTable(pbnstSttnRes); + }else{ + setBdstTable([]); + } + }, [pbnstSttnRes]); useEffect(() =>{ - pbnSttnInit("1", "20", ref.current, searchYear, pbnstSttn.fclts); - },[pbnstSttn.fclts]) - - // useEffect(() => { - // pbnstSttnSearch("1", "20", ref.current, pbnRuseNm, searchYear); - // }, [pageNation, ref.current, pbnRuseNm, searchYear, pbnstSttnSearch]); - - // useEffect(() => { - // if (pbnRuseNm.length > 1) - // pbnNmSearch(String(pageNation), "23", ref.current, pbnRuseNm, searchYear); - // }, [pbnRuseNm,pageNation]); - - useEffect(() => { - // pbnstSttnSearch(false, String(pageNation), "20", returnType, pbnRuseNm, searchYear); - }, [pageNation]); + pbnSttnInit("1", "15", ref.current, searchYear, pbnstSttn.fclts); + },[fclts]) useEffect(() => { if (pbnstSttn.pbnstDetail.pbnstRuseFcltPk) @@ -165,12 +156,14 @@ export default function PbnstSttn() { } queryClick={function (returnType: ReturnType): void { - console.log("시군구코드", returnType) setReturnType(returnType); - pbnstSttnSearch(false, "1", "20", returnType, pbnRuseNm, searchYear); + pbnstSttnSearch(false, "1", "15", returnType, pbnRuseNm, searchYear, fclts); }} excelClick={excelClick} - initClick={function (): void { }} + initClick={function (): void { + setPbnRuseNm('') + + }} btnClass={btnClass} ref={ref} isAdmin={false} @@ -187,8 +180,8 @@ export default function PbnstSttn() { } headlist={pbnstSttn.pbnstSttHeadList} - pageSize={20} - total={100000} + pageSize={15} + total={pbnstSttnResCount} cellClick={(index: number | undefined, headId: string) => { cellCLick(index); }} @@ -196,10 +189,11 @@ export default function PbnstSttn() { pbnstSttnSearch( false, String(page), - String(20), + String(15), ref.current, pbnRuseNm, - searchYear + searchYear, + fclts ); }} > diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx index 8a1db05a2..d39a63680 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/excel.tsx @@ -13,15 +13,19 @@ export const excelPbnstSttnParsing = (data: any[]): string[][] => { String(item.gugun ?? ""), String(item.bscFctNm ?? ""), String(item.efflWqltStndrdNm ?? ""), - String(item.fctCpc ?? ""), String(item.tel ?? ""), + String(item.fctCpc ?? ""), String(item.ruseUtztnFcltNm ?? ""), String(item.fcltCpct ?? ""), String(item.splyExtraCpct ?? ""), String(item.ruseCpct ?? ""), String(item.usageTotal ?? ""), String(item.inUsage ?? ""), - String(item.outUsage ?? ""), + String(item.outUsage ?? ""), + String(item.operMthd ?? ""), + String(item.rprtvBzenty ?? ""), + String(item.bgngDt ?? ""), + String(item.endDt ?? ""), ]) }) return excelExportData; diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx index 939d2c37a..f54eb5cbd 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/pbnstSttn/index.tsx @@ -27,6 +27,7 @@ export type pbnstSttnState = { ruseGuranteeHeadList: TableUpperProps[] ruseDmdHeadList: TableUpperProps[] ruseFcltHeadList: TableUpperProps[] + pbnstSttnResCount:number; excelList: []; fclts:string[] isInit: boolean; @@ -41,7 +42,8 @@ type pbnstSttnActions = { total: string, reurnValue: ReturnType, searchNm: string | undefined, - year: string + year: string, + fclts:string[] ) => void; getFlcts:()=>void; pbnSttnInit: ( @@ -74,6 +76,7 @@ export const pbnstSttnStateExport: pbnstSttnState = { ruseDmdHeadList: ruseDmdHeadListExport, ruseFcltHeadList: ruseFcltHeadListExport, pbnstSttnRes: [], + pbnstSttnResCount:1, pbnstDetail: {} as customPbnst, pbnstSearchData: [], excelList: [], @@ -104,21 +107,21 @@ const hasuListFetch = async ( ? reurnValue.unitWaterShedValue : reurnValue.middleRegionValue }/0/1/SW` - } else if( reurnValue.partValue === 'G2120'){ - url += `${page}/${total}/${reurnValue.envPartValue}/${reurnValue.sidoValue ? reurnValue.sidoValue : reurnValue.sigunValue}/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{ url += `1/2/A/0/0/1/SW` - } + if (searchNm && searchNm?.length > 0) { url += "/" + searchNm } - - const pbnList = await postFectch(url, flcts,fetchType.COMMON); - - const getRuseList = await postFectch( `/reuseFc/pubDetailList/${year}`, flcts, @@ -133,64 +136,66 @@ const hasuListFetch = async ( (fclt: pubHasuType) => fclt.bscFctCd === item.pbnstRuseFcltPk.substring(0, 11) ); + if(findData){ - const usage = item.prfList.reduce( - (acc, cur) => { - acc.inUsage += - cur.wshwtr + - cur.coolUswtr + - cur.cleanUswtr + - cur.drwtUswtr + - cur.dltnUswtr + - cur.ithlRswtr + - cur.ithlEtcUswtr + - cur.cleanToilUswtr + - cur.resn; - acc.outUsage += - cur.lndwtr + - cur.hydUswtr + - cur.ugwtChr + - cur.farmUswtr + - cur.rvrKeepUswtr + - cur.indstUswtr; - acc.total = acc.inUsage + acc.outUsage; + const usage = item.prfList.reduce( + (acc, cur) => { + acc.inUsage += + cur.wshwtr + + cur.coolUswtr + + cur.cleanUswtr + + cur.drwtUswtr + + cur.dltnUswtr + + cur.ithlRswtr + + cur.ithlEtcUswtr + + cur.cleanToilUswtr + + cur.resn; + acc.outUsage += + cur.lndwtr + + cur.hydUswtr + + cur.ugwtChr + + cur.farmUswtr + + cur.rvrKeepUswtr + + cur.indstUswtr; + acc.total = acc.inUsage + acc.outUsage; + + return acc; + }, + { total: 0, inUsage: 0, outUsage: 0 } + ); + + return { + rvbsn: findData?.rvbsn ||'-', + lgbsn: findData?.lgbsn||'-', + mdmbsn: findData?.mdmbsn||'-', + rgnNm: findData?.rgnNm||'-', + sido: findData?.sido||'-', + gugun: findData?.gugun||'-', + bscFctNm: findData?.bscFctNm||'-', + efflWqltStndrdNm: findData?.efflWqltStndrdNm||'-', + fctCpc: Number(findData?.fctCpc)||0, + tel: findData?.tel ?? "-", + ruseUtztnFcltNm: item?.ruseUtztnFcltNm||'-', + fcltCpct: item?.fcltCpct||'-', + splyExtraCpct: item?.splyExtraCpct||'-', + ruseCpct: item?.ruseCpct||'-', + pbnstRuseFcltPk: item.pbnstRuseFcltPk||'-', + usageTotal: usage?.total, + inUsage: usage?.inUsage, + outUsage: usage?.outUsage, + operMthd: item.operList[0]?.operMthd||'-', + rprtvBzenty: item.operList[0]?.rprtvBzenty, + bgngDt: moment(item.operList[0]?.bgngDt).format("YYYY-MM-DD") ?? "", + endDt: moment(item.operList[0]?.endDt).format("YYYY-MM-DD") ?? "", + searchNm: findData?.bscFctNm||'-', + searchPk: findData?.bscFctCd||'-', + prfList: item?.prfList ?? [] + }; + } - return acc; - }, - { total: 0, inUsage: 0, outUsage: 0 } - ); - - return { - rvbsn: findData?.rvbsn, - lgbsn: findData?.lgbsn, - mdmbsn: findData?.mdmbsn, - rgnNm: findData?.rgnNm, - sido: findData?.sido, - gugun: findData?.gugun, - bscFctNm: findData?.bscFctNm, - efflWqltStndrdNm: findData?.efflWqltStndrdNm, - fctCpc: findData.fctCpc, - tel: findData?.tel ?? "-", - ruseUtztnFcltNm: item.ruseUtztnFcltNm, - fcltCpct: item.fcltCpct, - splyExtraCpct: item.splyExtraCpct, - ruseCpct: item.ruseCpct, - pbnstRuseFcltPk: item.pbnstRuseFcltPk, - usageTotal: usage.total, - inUsage: usage.inUsage, - outUsage: usage.outUsage, - operMthd: item.operList[0]?.operMthd, - rprtvBzenty: item.operList[0]?.rprtvBzenty, - bgngDt: moment(item.operList[0]?.bgngDt).format("YYYY-MM-DD") ?? "", - endDt: moment(item.operList[0]?.endDt).format("YYYY-MM-DD") ?? "", - searchNm: findData.bscFctNm, - searchPk: findData.bscFctCd, - prfList: item?.prfList ?? [] - }; } - ); + ).filter(Boolean); - console.log('data ', data) return data; }; @@ -227,13 +232,11 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( reurnValue: ReturnType, searchNm: string | undefined, year: string, + fclts:string[] ) => { try { - let fclts = [] as any - set((state: pbnstSttnState) => { - fclts = state.pbnstSttn.fclts - }); + const pbnstSttnRes = await hasuListFetch( page, total, @@ -246,7 +249,6 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( // if (Number(total) > 9000) { if (isExcel) { const pbnstExcel = excelPbnstSttnParsing(pbnstSttnRes); - set((state: pbnstSttnState) => { return { ...state, @@ -256,17 +258,20 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( }, }; }); - } else + } else{ + set((state: pbnstSttnState) => { return { ...state, pbnstSttn: { ...state.pbnstSttn, pbnstSttnRes: pbnstSttnRes, - isInit: false, + pbnstSttnResCount:pbnstSttnRes.length + // isInit: false, }, }; }); + } } catch (erTxt) { console.log("error", erTxt); } @@ -294,6 +299,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( pbnstSttn: { ...state.pbnstSttn, pbnstSttnRes: pbnstSttnRes, + pbnstSttnResCount:pbnstSttnRes.length, isInit: false, }, }; @@ -344,6 +350,7 @@ export const pbnstSttnActionsExport: (set: any) => pbnstSttnActions = ( pbnstSttn: { ...state.pbnstSttn, pbnstSearchData: pbnstSttnRes, + pbnstSttnResCount:pbnstSttnRes.length, }, }; });