From 2085b782316df1ab4e7b8e5aadec6072ac4be37f Mon Sep 17 00:00:00 2001 From: leedj312 Date: Mon, 14 Jul 2025 16:17:10 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=EC=84=A4=20=EB=93=B1=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx | 4 ++-- .../store/ruseFcltMng/fcltReg/pbnstReg/index.tsx | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx index fa37a7704..a583efccf 100644 --- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx @@ -46,7 +46,7 @@ export default function PublicReuseFaciltyInsert() { pubHasuSearch, pbnstRuseBizUpdate, } = useWrStore((state) => state); - const { pubFacHeadList, pbnstHasuRes, pbnstRes } = pbnst; + const { pubFacHeadList, pbnstHasuResCount,pbnstHasuRes, pbnstRes } = pbnst; const [, setCurrentTab] = useState("mng"); const [isRuseReg, setIsRuseReg] = useState<{ isModal: boolean; @@ -322,7 +322,7 @@ export default function PublicReuseFaciltyInsert() { tableData={bdstTable || []} headlist={pubFacHeadList} pageSize={10} - total={100000} + total={pbnstHasuResCount||20} headName={"공공 하수처리시설 목록"} cellClick={cellClick} onPageChange={setPageNation} diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx index 00c965273..493783d8e 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx @@ -55,6 +55,7 @@ export type pubFacState = { fcOrgwtsNmList:pubHasuType[]; dmdComList: any[]; apiMessage:string; + pbnstHasuResCount:number }; }; type pubFacActions = { @@ -91,7 +92,8 @@ export const pubFacStateExport: pubFacState = { pbnsUpdateIndex: {} as pbnstInsertIndex, fcOrgwtsNmList:[], dmdComList: [], - apiMessage:'' + apiMessage:'', + pbnstHasuResCount:1 }, }; @@ -125,7 +127,7 @@ if(searchTxt){ }; }); - return hasuList; + return {data: hasuList, count:rainRes.count}; }; const initFetch = async (ruseFcltPk: string | undefined) => { @@ -180,7 +182,8 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => { ...state, pbnst: { ...state.pbnst, - pbnstHasuRes: pbnstHasuRes, + pbnstHasuRes: pbnstHasuRes.data, + pbnstHasuResCount:pbnstHasuRes.count, isInit: false, }, })); @@ -195,7 +198,8 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => { ...state, pbnst: { ...state.pbnst, - pbnstHasuRes: pbnstHasuRes, + pbnstHasuRes: pbnstHasuRes.data, + pbnstHasuResCount:pbnstHasuRes.count, isInit: false, }, })); @@ -233,7 +237,8 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => { ...state, pbnst: { ...state.pbnst, - pbnstRes: pbnstHasuRes, + pbnstHasuRes: pbnstHasuRes.data, + pbnstHasuResCount:pbnstHasuRes.count, isInit: false, }, })); From b806134cb4024278c397c584222ae471cec549ec Mon Sep 17 00:00:00 2001 From: leedj312 Date: Mon, 14 Jul 2025 16:38:16 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B1=B4=EC=B6=95=EB=AC=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9D=B4=EB=A0=A5=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ruseFcltMng/fcltReg/rainReg/page.tsx | 41 ++++--------------- .../app/ruseFcltMng/fcltReg/rswtReg/page.tsx | 32 +-------------- 2 files changed, 9 insertions(+), 64 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx index 83679a274..a7895ff13 100644 --- a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx @@ -1,12 +1,10 @@ "use client"; import { useWrStore } from "@/app/store"; import { - type chgBuilding, type customRainBdst, } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { tableData } from "@/components/lib/func/commom"; import RainRegForm from "@/components/ui/form/fcltReg/rainReg/rainRegForm"; -import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal"; import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; import { ContentsDiv, @@ -35,10 +33,6 @@ export default function Home() { const [pageNation, setPageNation] = useState(1); const [bdstTable, setbdstTable] = useState(); const [searchTxt, setSearchTxt] = useState(); - const [bdstChgProps, setBdstChgProps] = useState<{ - isOpen: boolean; - chgBuilding: chgBuilding[]; - }>({ isOpen: false, chgBuilding: [] }); useEffect(() => { setIsNewReg(false); @@ -60,7 +54,6 @@ export default function Home() { ...item, archArea: archArea, - bdstChgYn: item.chgBuilding.length > 0 ? "Y" : "N", }; } ); @@ -71,27 +64,18 @@ export default function Home() { } } }, [code, rainRes]); - const cellClick: (val: number | undefined, headId: string) => void = ( - val, - headId + const cellClick: (val: number | undefined) => void = ( + val ) => { if (val !== undefined) { setRainForm(rainRes[val]); } - if (headId === "bdstChgYn" && val !== undefined) { - if ( - rainRes[val]?.bdstInfoPk != null && - rainRes[val]?.chgBuilding.length > 0 - ) { - bdstChgModal(rainRes[val].chgBuilding); - } - } }; - const bdstChgModal = (chgBuilding: chgBuilding[]) => { - setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding }); - }; + // const bdstChgModal = (chgBuilding: chgBuilding[]) => { + // setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding }); + // }; useEffect(() => { getRainData(pageNation, "41"); @@ -149,8 +133,8 @@ export default function Home() { pageSize={20} total={rainResCount} headName={"건축물 목록"} - cellClick={(val, headId) => { - cellClick(val, headId); + cellClick={(val) => { + cellClick(val); }} onPageChange={setPageNation} > @@ -183,17 +167,6 @@ export default function Home() { }} /> - - } - onOpenChange={(open) => { - setBdstChgProps({ ...bdstChgProps, isOpen: open }); - }} - /> - diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx index 686154bc9..6945788c4 100644 --- a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx @@ -1,10 +1,8 @@ "use client"; import { useWrStore } from "@/app/store"; -import type { chgBuilding } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import type { customRswtBdst } from "@/app/store/ruseFcltMng/fcltReg/rswtReg"; import { tableData } from "@/components/lib/func/commom"; import RswtrRegForm from "@/components/ui/form/fcltReg/rswtrReg/rswtrRegForm"; -import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal"; import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; import { ContentsDiv, @@ -32,10 +30,6 @@ export default function Home() { const [pageNation, setPageNation] = useState(1); const [selectVal, setSelect] = useState(); const [bdstTable, setbdstTable] = useState(); - const [bdstChgProps, setBdstChgProps] = useState<{ - isOpen: boolean; - chgBuilding: chgBuilding[]; - }>({ isOpen: false, chgBuilding: [] }); const { rswtRes, rswtResCount } = rswt; useEffect(() => { if (!rswt.isInit) { @@ -77,28 +71,16 @@ export default function Home() { }, [rswtRes, selectVal]); const cellClick: (val: number | undefined, headId: string) => void = ( - val, - headId + val ) => { if ((bdstTable ?? []).length > 0 && val !== undefined) { { setSelect(val); - // setRswtForm(rswtRes[val]); } } - if (headId === "bdstChgYn" && val !== undefined) { - if ( - rswtRes[val]?.bdstInfoPk != null && - rswtRes[val]?.chgBuilding?.length > 0 - ) { - bdstChgModal(rswtRes[val].chgBuilding); - } - } - }; - const bdstChgModal = (chgBuilding: chgBuilding[]) => { - setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding }); }; + useEffect(() => { getRswtBdstData(pageNation, "41"); }, [pageNation]); @@ -184,16 +166,6 @@ export default function Home() { setIsNewReg(open); }} /> - - } - onOpenChange={(open) => { - setBdstChgProps({ ...bdstChgProps, isOpen: open }); - }} - /> From 01c137efcadb98478f24a3e1947760c7e873b435 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Mon, 14 Jul 2025 16:43:28 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=8B=9C=EC=84=A4=20=ED=98=84=ED=99=A9=20=EC=A4=91?= =?UTF-8?q?=EC=B6=95/=EA=B0=9C=EC=B6=95=20=EB=93=B1=20=EB=8B=A8=EB=8F=85?= =?UTF-8?q?=20=ED=8C=9D=EC=97=85=20=ED=98=B8=EC=B6=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/rainSttn/page.tsx | 140 +++++++++++------- .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx | 31 +--- 2 files changed, 87 insertions(+), 84 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx index 13d0cc974..be2f82319 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx @@ -1,17 +1,14 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ "use client"; import { useWrStore } from "@/app/store"; import { btnClass } from "@/app/store/common/code"; import type { - chgBuilding, customRainBdst, } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { excelDownload, getCity, - tableData + tableData, } from "@/components/lib/func/commom"; -import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal"; import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal"; import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal"; import SttnDetailModal from "@/components/ui/modal/sttn/sttnDetailModal/sttnDetailModal"; @@ -25,7 +22,7 @@ import { Title, UiModal, UiTable, - type SelectDataType + type SelectDataType, } from "@common/business_components/ui"; import ListDiv from "@common/business_components/ui/list_div"; import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan"; @@ -43,24 +40,24 @@ export default function RainSttn() { const [pageNation, setPageNation] = useState(1); const [isChHead, setIsChHead] = useState(false); const [bdstTable, setBdstTable] = useState(); - const [selectSgg, setSelectSgg] = useState() + const [selectSgg, setSelectSgg] = useState(); const [resetPage, isResetPage] = useState(false); const isDownloadTriggered = useRef(false); - const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); - const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRainBdst | undefined }>({ data: undefined, isOpen: false }) - const [bdstChgProps, setBdstChgProps] = useState<{ + const [objSearch, setObjSearch] = useState({ + sgg: "", + city: "", + }); + const [detailModal, setDetailModal] = useState<{ isOpen: boolean; - chBuilding: chgBuilding[]; - }>({ isOpen: false, chBuilding: [] }); + data: customRainBdst | undefined; + }>({ data: undefined, isOpen: false }); + const [fcltNm, setFcltNm] = useState(""); - const { t } = useTranslation('base'); - const cellClick = (index: number | undefined, headId: string) => { - if (headId !== 'chBuildingYn' && index !== undefined && bdstTable !== undefined) { - setDetailModal({ isOpen: true, data: bdstTable[index] }) - } else if (headId === 'chBuildingYn' && index !== undefined && bdstTable !== undefined) { - if (bdstTable[index] && bdstTable[index]?.chgBuilding[0]?.bdstChgNm !== null) { - setBdstChgProps({ isOpen: true, chBuilding: bdstTable[index].chgBuilding }); - } + const { t } = useTranslation("base"); + + const cellClick = (index: number | undefined) => { + if (index !== undefined && bdstTable !== undefined) { + setDetailModal({ isOpen: true, data: bdstTable[index] }); } }; @@ -72,13 +69,14 @@ export default function RainSttn() { } else { const data = getCity(cityValue, code.sggCd); setSelectSgg(data); - const firstSggVal = data.find(item => item.val === "0")?.val || (data[0]?.val ?? ""); + const firstSggVal = + data.find((item) => item.val === "0")?.val || (data[0]?.val ?? ""); setObjSearch({ city: cityValue, sgg: firstSggVal }); } }; const getSgg = (val: string | number) => { - setObjSearch({ ...objSearch, sgg: String(val) }) + setObjSearch({ ...objSearch, sgg: String(val) }); }; const getConValue = () => { @@ -105,23 +103,29 @@ export default function RainSttn() { ...item, ...item.reuseBuilding[0], ...item.reuseBuilding[0].rainyObj, - dtfcltCpct: item.reuseBuilding[0].rainyObj.dtfcltCpct === -1 - ? "확인불가" - : item.reuseBuilding[0].rainyObj.dtfcltCpct, - instlCst: item.reuseBuilding[0].instlCst === -1 - ? "확인불가" - : item.reuseBuilding[0].instlCst, - instlCstSprtAmt: item.reuseBuilding[0].instlCstSprtAmt === -1 - ? "확인불가" - : item.reuseBuilding[0].instlCstSprtAmt, + dtfcltCpct: + item.reuseBuilding[0].rainyObj.dtfcltCpct === -1 + ? "확인불가" + : item.reuseBuilding[0].rainyObj.dtfcltCpct, + instlCst: + item.reuseBuilding[0].instlCst === -1 + ? "확인불가" + : item.reuseBuilding[0].instlCst, + instlCstSprtAmt: + item.reuseBuilding[0].instlCstSprtAmt === -1 + ? "확인불가" + : item.reuseBuilding[0].instlCstSprtAmt, chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N", - pntfColArea: item.reuseBuilding[0].rainyObj.pntfColArea === -1 - ? "확인불가" - : item.reuseBuilding[0].rainyObj.pntfColArea, - filtrTrtmfctCpct: item.reuseBuilding[0].rainyObj.filtrTrtmfctCpct === -1 - ? "확인불가" - : item.reuseBuilding[0].rainyObj.filtrTrtmfctCpct, - archArea: Math.floor(item.archArea) === -1 ? "확인불가" : item.archArea, + pntfColArea: + item.reuseBuilding[0].rainyObj.pntfColArea === -1 + ? "확인불가" + : item.reuseBuilding[0].rainyObj.pntfColArea, + filtrTrtmfctCpct: + item.reuseBuilding[0].rainyObj.filtrTrtmfctCpct === -1 + ? "확인불가" + : item.reuseBuilding[0].rainyObj.filtrTrtmfctCpct, + archArea: + Math.floor(item.archArea) === -1 ? "확인불가" : item.archArea, }; }) .filter((item: any) => item.rainyObj !== undefined); @@ -129,8 +133,16 @@ export default function RainSttn() { }, [code, rainSttnRes]); useEffect(() => { - rainSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); - isResetPage(false) + rainSttnSearch( + false, + pageNation, + "20", + String(getConValue()), + fcltNm, + code.cityCd, + code.sggCd + ); + isResetPage(false); }, [pageNation]); useEffect(() => { @@ -145,15 +157,30 @@ export default function RainSttn() { "A1:W3" ); } else { - toast.error(t('excelDownErrMsg')); + toast.error(t("excelDownErrMsg")); } isDownloadTriggered.current = false; }, [rainSttn.excelList]); const excelClick = useCallback(() => { isDownloadTriggered.current = true; - rainSttnSearch(true, 1, String(rainSttnResCount), String(getConValue()), fcltNm, code.cityCd, code.sggCd); - }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd, fcltNm, rainSttnResCount]); + rainSttnSearch( + true, + 1, + String(rainSttnResCount), + String(getConValue()), + fcltNm, + code.cityCd, + code.sggCd + ); + }, [ + rainSttnSearch, + objSearch, + code.cityCd, + code.sggCd, + fcltNm, + rainSttnResCount, + ]); return ( <> @@ -192,14 +219,21 @@ export default function RainSttn() { - +