From 960e5f7dd133f7d741b1f07f3c51282bc6c14f68 Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 30 Oct 2025 11:03:14 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/(with-layout)/processArea/page.tsx | 6 +- apps/fo/app/store/processArea/index.tsx | 64 +++++++++++++++---- apps/fo/app/store/processFacility/index.tsx | 23 +++++++ 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/apps/fo/app/pages/(with-layout)/processArea/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/page.tsx index fc571c665..b9519a4e6 100644 --- a/apps/fo/app/pages/(with-layout)/processArea/page.tsx +++ b/apps/fo/app/pages/(with-layout)/processArea/page.tsx @@ -70,12 +70,10 @@ export default function ProcessArea() { unitWaterShedValue: '', middleRegionValue: '', envPartValue: '', - sidoText: '', - sigunText: '' }); - const searchProcessArea = useCallback(({ sidoText, sigunText}: ReturnType, pageNo: number, pageCnt:number=20) => { - searchProcessAreaList(pageNo, pageCnt, sidoText, sigunText, searchYearValue); + const searchProcessArea = useCallback(({ sidoValue, sigunValue, sidoText, sggText}: ReturnType, pageNo: number, pageCnt:number=20) => { + searchProcessAreaList(pageNo, pageCnt, sidoValue, sigunValue, searchYearValue); }, [searchProcessAreaList, searchYearValue]); // 조회 diff --git a/apps/fo/app/store/processArea/index.tsx b/apps/fo/app/store/processArea/index.tsx index 37b4d52f0..54b8258f7 100644 --- a/apps/fo/app/store/processArea/index.tsx +++ b/apps/fo/app/store/processArea/index.tsx @@ -2,6 +2,7 @@ import { postFetch } from "@/app/components/api"; import DataForm from "@/app/components/common/DataForm"; import { fetchPlanInfo } from "../common"; import type { TableUpperProps } from "../dashboard"; +import { fetchFacilityListArea } from "../processFacility"; export type { TableUpperProps }; /**==================================== * Store - 타입 @@ -261,16 +262,7 @@ const fetchProcessAreaList = async (pageNo : number, pageSize : number, ctpvNm : head.title = '기승인\n4단계'; } }); - const res = await fetchFacilityDetailInfo(item.swtrmtFcltCd); - const detailInfo = res.data.filter((item:ProcessAreaProps) => item.ruse === true); - return { - ...item, - sido: detailInfo.length > 0 ? detailInfo[0].sido||'' : '', - sigungo: detailInfo.length > 0 ? detailInfo[0].gugun||'' : '', - location: detailInfo.length > 0 ? detailInfo[0].addr||'' : '', - fctCpc: detailInfo.length > 0 ? detailInfo[0].fctCpc||'' : 0, - trtDstr: detailInfo.length > 0 ? detailInfo[0].trtDstr||'' : '', - }; + return item; }) ); const startIndex = (pageNo - 1) * pageSize; @@ -365,7 +357,7 @@ export const processAreaReducer:(set:SetStateFunction)=>ProcessAreaActions=(set: * @param pageNo : 페이지 번호 * @param pageSize : 페이지 크기 */ - searchProcessAreaList: async ( pageNo:number, pageSize:number, ctpvNm?:string, sggNm?:string, targetYear?:string) => { + searchProcessAreaList: async ( pageNo:number, pageSize:number, sidoValue?:string, sggValue?:string, ctpvNm?:string, sggNm?:string, targetYear?:string) => { set((state: ProcessAreaType) => ({ ...state, ProcessArea: { @@ -373,7 +365,55 @@ export const processAreaReducer:(set:SetStateFunction)=>ProcessAreaActions=(set: isLoading: true, }, })); - const res = await fetchProcessAreaList(pageNo, pageSize, ctpvNm, sggNm, targetYear, set); + //const res = await fetchProcessAreaList(pageNo, pageSize, ctpvNm, sggNm, targetYear, set); + const res = await fetchFacilityListArea(pageNo, pageSize, sidoValue, sggValue, targetYear); + set((state: ProcessAreaType) => ({ + ...state, + ProcessArea: { + ...state.ProcessArea, + processAreaList: res.data, + processAreaCount: res.count, + isInit: true, + }, + })); + + const fcltyList = res.data; + + for(let i=0; i 0){ + // 증설계획 + fcltyList[i].planSwageQntSumDt4 = fcltyRes[0].planSwageQntSumDt4; + fcltyList[i].planSwageQntSum = fcltyRes[0].planSwageQntSum; + fcltyList[i].planSwageQntSumDc1 = fcltyRes[0].planSwageQntSumDc1; + fcltyList[i].planSwageQntSumDc2 = fcltyRes[0].planSwageQntSumDc2; + fcltyList[i].planSwageQntSumDc3 = fcltyRes[0].planSwageQntSumDc3; + fcltyList[i].planSwageQntSumDc4 = fcltyRes[0].planSwageQntSumDc4; + // 처리인구 + fcltyList[i].swtrmtPpltnCntDt4 = fcltyRes[0].swtrmtPpltnCntDt4; + fcltyList[i].swtrmtPpltnCnt = fcltyRes[0].swtrmtPpltnCnt; + fcltyList[i].swtrmtPpltnCntDc1 = fcltyRes[0].swtrmtPpltnCntDc1; + fcltyList[i].swtrmtPpltnCntDc2 = fcltyRes[0].swtrmtPpltnCntDc2; + fcltyList[i].swtrmtPpltnCntDc3 = fcltyRes[0].swtrmtPpltnCntDc3; + fcltyList[i].swtrmtPpltnCntDc4 = fcltyRes[0].swtrmtPpltnCntDc4; + // 처리구역면적 + fcltyList[i].swtrmtZoneAreaDt4 = fcltyRes[0].swtrmtZoneAreaDt4; + fcltyList[i].swtrmtZoneArea = fcltyRes[0].swtrmtZoneArea; + fcltyList[i].swtrmtZoneAreaDc1 = fcltyRes[0].swtrmtZoneAreaDc1; + fcltyList[i].swtrmtZoneAreaDc2 = fcltyRes[0].swtrmtZoneAreaDc2; + fcltyList[i].swtrmtZoneAreaDc3 = fcltyRes[0].swtrmtZoneAreaDc3; + fcltyList[i].swtrmtZoneAreaDc4 = fcltyRes[0].swtrmtZoneAreaDc4; + // 계획연도 + fcltyList[i].planYrDt4 = fcltyRes[0].planYrDt4; + fcltyList[i].planYr = fcltyRes[0].planYr; + fcltyList[i].planYrDc1 = fcltyRes[0].planYrDc1; + fcltyList[i].planYrDc2 = fcltyRes[0].planYrDc2; + fcltyList[i].planYrDc3 = fcltyRes[0].planYrDc3; + fcltyList[i].planYrDc4 = fcltyRes[0].planYrDc4; + } + } + res.data.forEach((item:ProcessAreaProps) => { DataForm({ type: 'float1', column: 'fctCpc', item:item as unknown as Record}); }) diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx index 5cdab43b6..216fad59a 100644 --- a/apps/fo/app/store/processFacility/index.tsx +++ b/apps/fo/app/store/processFacility/index.tsx @@ -431,6 +431,29 @@ export const fetchFacilityListInit = async (pageNo:number, pageSize:number, part } }; +// 시설정보 리스트 데이터 호출(구분 선택 후 시설명 있을 경우) 처리구역용. pageNo, pageSize, ctpvNm, sggNm, targetYear, +export const fetchFacilityListArea = async (pageNo:number, pageSize:number, ctpvNm?:string, sggNm?:string, targetYear?:string ): Promise<{data:any[], count:number}> => { + try { + console.log(pageNo, pageSize ,ctpvNm, sggNm, targetYear) + const tailStr = "/A"+ (ctpvNm?"/"+ctpvNm:"/0") + (sggNm?"/"+sggNm:"/0") + "/0/0" ; + console.log(tailStr); + const url = '/prcsFclt/info/'+pageNo+'/'+pageSize+tailStr; + const res = await getFetch('fo', url); + res.data.forEach((item: Record) => { + item.daddr = item.addr ? item.addr : ''; + item.sidoNm = item.sido ? item.sido : ''; + item.sigungo = item.gugun ? item.gugun : ''; + item.swtrmtFcltNm = item.bscFctNm ? item.bscFctNm : ''; + item.location = item.daddr ? item.daddr : ''; + item.trtDstr = item.trtDstr ? item.trtDstr : ''; + }); + + return res; + } catch (error) { + console.error('시설정보 데이터를 가져오는데 실패했습니다:', error); + return {data: [], count: 0}; + } +}; const fetchFacilityList = async (pageNo:number, pageSize:number, partValue?:string, nameCd?:string, fcltCpct?:string, oprtngSttsCd?:string, facilityPartValue?:string, facilityName?:string ): Promise<{data:facilityListProps[], count:number}> => { try { From 2a917e4e2d34aabce32c93d27a84365a2fe7c965 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Thu, 30 Oct 2025 11:34:43 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9=20:=20?= =?UTF-8?q?=EC=8B=A4=EC=A0=81=20=EB=93=B1=EB=A1=9D=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=BD=94=EB=93=9C=EC=97=86=EC=9D=84=EC=8B=9C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=95=88=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx | 3 ++- apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx index bedb71815..75a2e6860 100644 --- a/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx +++ b/apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx @@ -209,8 +209,9 @@ export default function PrfmncPrfmncReg() { useEffect(() => { const year = new Date().getFullYear(); + if(laeSeCd === undefined || laeSeCd ==='') return; prfmncHasuInit(1, laeSeCd, String(year), prfPbnFclts); - }, [prfPbnFclts]); + }, [prfPbnFclts,laeSeCd]); useEffect(() => { if (prfmncRes && prfmncRes.length > 0) { diff --git a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx index 6c2564655..3bcca799e 100644 --- a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx +++ b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx @@ -75,7 +75,6 @@ const hasuListFetch = async ( : fclt.slice(0, 5) === sggOrCity; }); } - let url = `/prcsFclt/ruseInfo/1/${filteredFclt.length + 1}/A/${sggOrCity}/0/1/SW`; if (searchTxt && searchTxt?.length > 0) { url += `/${searchTxt}`; @@ -121,7 +120,6 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = ( getPrfFmcRes: async () => { try { const pbnPrfRes = await getFetch(fetchType.WR, "/reuseFc/pubFc"); - console.log("pbnPrfRes ", pbnPrfRes); set((state: pbnstPrfmncState) => ({ ...state, prfmnc: { @@ -140,7 +138,6 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = ( prfPbnFclts: string[] ) => { try { - console.log("prfPbnFclts ", prfPbnFclts); const prfmncRes = await hasuListFetch( page, sggOrCity, From 3c6d10a5e3a0345e5b6d2b961723db1ae8a0236b Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 30 Oct 2025 16:19:21 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84=ED=86=B5?= =?UTF-8?q?=EA=B3=84,=20=EB=B9=97=EB=AC=BC=EC=8B=9C=EC=84=A4=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=20=EA=B1=B4=EC=88=98=20=EC=B6=94=EC=B6=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(=EC=B6=94=ED=9B=84=EC=97=90=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B0=94=EB=A1=9C=20=EB=B0=94=EB=9D=BC?= =?UTF-8?q?=EB=B3=BC=EC=88=98=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=ED=95=84=EC=9A=94=ED=95=A0=EB=93=AF=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/store/common/type/header.tsx | 1 + apps/wr/app/store/stats/rainStat/headList.tsx | 7 +++++++ apps/wr/app/store/stats/rainStat/index.tsx | 12 ++++++++---- apps/wr/app/store/stats/rswtStat/headList.tsx | 6 ++++++ apps/wr/app/store/stats/rswtStat/index.tsx | 3 +-- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/wr/app/store/common/type/header.tsx b/apps/wr/app/store/common/type/header.tsx index 29780ba03..75bf29433 100644 --- a/apps/wr/app/store/common/type/header.tsx +++ b/apps/wr/app/store/common/type/header.tsx @@ -24,5 +24,6 @@ export type TableUpperProps = { mergeCell?:boolean // 셀을 합칠경우 maxLength?:number readonly?:boolean + commonCode?:string // 공통코드 사용할경우 }; diff --git a/apps/wr/app/store/stats/rainStat/headList.tsx b/apps/wr/app/store/stats/rainStat/headList.tsx index 664e060c4..7601919d5 100644 --- a/apps/wr/app/store/stats/rainStat/headList.tsx +++ b/apps/wr/app/store/stats/rainStat/headList.tsx @@ -40,36 +40,43 @@ export const rainStatHeadListExport: TableUpperProps[] = [ { id: "lndwtr", title: "조경용수", + commonCode : "01", row:1, }, { id: "cleanToilUswtr", title: "청소화장실용수", + commonCode : "02", row:1, }, { id:"resn", title:"세척살수용수", + commonCode : "03", row:1, }, { id: "farmUswtr", title: "농업용수", + commonCode : "04", row:1, }, { id: "indstUswtr", title: "공업용수", + commonCode : "05", row:1, }, { id: "hydUswtr", title: "친수용수", + commonCode : "06", row:1, }, { id: "ithlEtcUswtr", title: "기타", + commonCode : "07", row:1, }, { diff --git a/apps/wr/app/store/stats/rainStat/index.tsx b/apps/wr/app/store/stats/rainStat/index.tsx index 80787ae43..90687a905 100644 --- a/apps/wr/app/store/stats/rainStat/index.tsx +++ b/apps/wr/app/store/stats/rainStat/index.tsx @@ -89,8 +89,6 @@ export const rainStatActionsExport = ( searchRainStatList: async (year: string, city: SelectDataType[]) => { const res = await fetchRainStatList(year); const cityArr: any[] = []; - - console.log('res ', res) res.filter((resFilter: RainStatProps) => city.some((cityCd) => @@ -116,14 +114,20 @@ export const rainStatActionsExport = ( obj.dtfcltCpct = item.dtfcltCpct; obj.wtrUsqty = item.wtrUsqty; obj.anlOperCst = item.anlOperCst; - + obj.lndwtr = 0; //조경용수 + obj.cleanToilUswtr = 0; //청소화장실용수 + obj.resn = 0; //세척살수용수 + obj.farmUswtr = 0; //농업용수 + obj.indstUswtr = 0; //공업용수 + obj.hydUswtr = 0; //친수용수 + obj.ithlEtcUswtr = 0; //기타 cityArr.push(obj); } if (item.guideStats && item.guideStats.length > 0) { item.guideStats.forEach((guide: GuideStatProps) => { rainStatHeadListExport.forEach((headItem: TableUpperProps) => { - if (headItem.title == guide.utztnUsgCd) { + if (headItem.commonCode == guide.utztnUsgCd) { if (!obj[headItem.id] || typeof obj[headItem.id] !== "number") obj[headItem.id] = 0; if (typeof obj[headItem.id] === "number") { diff --git a/apps/wr/app/store/stats/rswtStat/headList.tsx b/apps/wr/app/store/stats/rswtStat/headList.tsx index c0860fea7..47aeca57b 100644 --- a/apps/wr/app/store/stats/rswtStat/headList.tsx +++ b/apps/wr/app/store/stats/rswtStat/headList.tsx @@ -64,31 +64,37 @@ export const rswtStatHeadListExport :TableUpperProps[]=[ { id: "lndwtr", title: "조경용수", + commonCode: "01", row:1, }, { id: "cleanToilUswtr", title: "청소화장실용수", + commonCode : "02", row:1, }, { id: "farmUswtr", title: "농업용수", + commonCode : "04", row:1, }, { id: "indstUswtr", title: "공업용수", + commonCode : "05", row:1, }, { id: "hydUswtr", title: "친수용수", + commonCode : "06", row:1, }, { id: "ithlEtcUswtr", title: "기타", + commonCode : "07", row:1, }, { diff --git a/apps/wr/app/store/stats/rswtStat/index.tsx b/apps/wr/app/store/stats/rswtStat/index.tsx index bd9a9c8e0..fa183f1a2 100644 --- a/apps/wr/app/store/stats/rswtStat/index.tsx +++ b/apps/wr/app/store/stats/rswtStat/index.tsx @@ -118,10 +118,9 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = ( item.guideStats.forEach((guide: GuideStatProps) => { rswtStatHeadListExport.forEach((headItem: TableUpperProps) => { - if (headItem.title == guide.utztnUsgCd) { + if (headItem.commonCode == guide.utztnUsgCd) { if (!obj[headItem.id] || typeof obj[headItem.id] !== "number") obj[headItem.id] = 0; if (typeof obj[headItem.id] === "number") { - obj[headItem.id] += guide.ruseFcltUtztnQnt; } } From 2ad8a26c7873fc3d510fd8dbe058287fabc21d93 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Thu, 30 Oct 2025 16:35:38 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EB=8C=80=EB=AF=BC=20=EB=B9=84=EA=B3=A0=20?= =?UTF-8?q?=EC=98=A4=EB=A5=B8=EC=AA=BD=20=EC=9E=85=EB=A0=A5=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/dm/components/ui/sdmInfoInsertForm/component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx index 5cfa526b8..2ba965a6e 100644 --- a/apps/dm/components/ui/sdmInfoInsertForm/component.tsx +++ b/apps/dm/components/ui/sdmInfoInsertForm/component.tsx @@ -896,7 +896,7 @@ export function SdmInfoRegForm({
{ field.onChange(e.target.value); From d3771d226be4ad158b3ecf5d1d062824eb614ce5 Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 30 Oct 2025 18:40:38 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/(with-layout)/processArea/page.tsx | 2 +- apps/fo/app/store/processArea/index.tsx | 63 ++++--------------- apps/fo/app/store/processFacility/index.tsx | 24 ------- 3 files changed, 13 insertions(+), 76 deletions(-) diff --git a/apps/fo/app/pages/(with-layout)/processArea/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/page.tsx index b9519a4e6..ed93a777a 100644 --- a/apps/fo/app/pages/(with-layout)/processArea/page.tsx +++ b/apps/fo/app/pages/(with-layout)/processArea/page.tsx @@ -72,7 +72,7 @@ export default function ProcessArea() { envPartValue: '', }); - const searchProcessArea = useCallback(({ sidoValue, sigunValue, sidoText, sggText}: ReturnType, pageNo: number, pageCnt:number=20) => { + const searchProcessArea = useCallback(({ sidoValue, sigunValue}: ReturnType, pageNo: number, pageCnt:number=20) => { searchProcessAreaList(pageNo, pageCnt, sidoValue, sigunValue, searchYearValue); }, [searchProcessAreaList, searchYearValue]); diff --git a/apps/fo/app/store/processArea/index.tsx b/apps/fo/app/store/processArea/index.tsx index 54b8258f7..f108e263e 100644 --- a/apps/fo/app/store/processArea/index.tsx +++ b/apps/fo/app/store/processArea/index.tsx @@ -262,7 +262,16 @@ const fetchProcessAreaList = async (pageNo : number, pageSize : number, ctpvNm : head.title = '기승인\n4단계'; } }); - return item; + const res = await fetchFacilityDetailInfo(item.swtrmtFcltCd); + const detailInfo = res.data.filter((item:ProcessAreaProps) => item.ruse === true); + return { + ...item, + sido: detailInfo.length > 0 ? detailInfo[0].sido||'' : '', + sigungo: detailInfo.length > 0 ? detailInfo[0].gugun||'' : '', + location: detailInfo.length > 0 ? detailInfo[0].addr||'' : '', + fctCpc: detailInfo.length > 0 ? detailInfo[0].fctCpc||'' : 0, + trtDstr: detailInfo.length > 0 ? detailInfo[0].trtDstr||'' : '', + }; }) ); const startIndex = (pageNo - 1) * pageSize; @@ -357,7 +366,7 @@ export const processAreaReducer:(set:SetStateFunction)=>ProcessAreaActions=(set: * @param pageNo : 페이지 번호 * @param pageSize : 페이지 크기 */ - searchProcessAreaList: async ( pageNo:number, pageSize:number, sidoValue?:string, sggValue?:string, ctpvNm?:string, sggNm?:string, targetYear?:string) => { + searchProcessAreaList: async ( pageNo:number, pageSize:number, ctpvNm?:string, sggNm?:string, targetYear?:string) => { set((state: ProcessAreaType) => ({ ...state, ProcessArea: { @@ -365,55 +374,7 @@ export const processAreaReducer:(set:SetStateFunction)=>ProcessAreaActions=(set: isLoading: true, }, })); - //const res = await fetchProcessAreaList(pageNo, pageSize, ctpvNm, sggNm, targetYear, set); - const res = await fetchFacilityListArea(pageNo, pageSize, sidoValue, sggValue, targetYear); - set((state: ProcessAreaType) => ({ - ...state, - ProcessArea: { - ...state.ProcessArea, - processAreaList: res.data, - processAreaCount: res.count, - isInit: true, - }, - })); - - const fcltyList = res.data; - - for(let i=0; i 0){ - // 증설계획 - fcltyList[i].planSwageQntSumDt4 = fcltyRes[0].planSwageQntSumDt4; - fcltyList[i].planSwageQntSum = fcltyRes[0].planSwageQntSum; - fcltyList[i].planSwageQntSumDc1 = fcltyRes[0].planSwageQntSumDc1; - fcltyList[i].planSwageQntSumDc2 = fcltyRes[0].planSwageQntSumDc2; - fcltyList[i].planSwageQntSumDc3 = fcltyRes[0].planSwageQntSumDc3; - fcltyList[i].planSwageQntSumDc4 = fcltyRes[0].planSwageQntSumDc4; - // 처리인구 - fcltyList[i].swtrmtPpltnCntDt4 = fcltyRes[0].swtrmtPpltnCntDt4; - fcltyList[i].swtrmtPpltnCnt = fcltyRes[0].swtrmtPpltnCnt; - fcltyList[i].swtrmtPpltnCntDc1 = fcltyRes[0].swtrmtPpltnCntDc1; - fcltyList[i].swtrmtPpltnCntDc2 = fcltyRes[0].swtrmtPpltnCntDc2; - fcltyList[i].swtrmtPpltnCntDc3 = fcltyRes[0].swtrmtPpltnCntDc3; - fcltyList[i].swtrmtPpltnCntDc4 = fcltyRes[0].swtrmtPpltnCntDc4; - // 처리구역면적 - fcltyList[i].swtrmtZoneAreaDt4 = fcltyRes[0].swtrmtZoneAreaDt4; - fcltyList[i].swtrmtZoneArea = fcltyRes[0].swtrmtZoneArea; - fcltyList[i].swtrmtZoneAreaDc1 = fcltyRes[0].swtrmtZoneAreaDc1; - fcltyList[i].swtrmtZoneAreaDc2 = fcltyRes[0].swtrmtZoneAreaDc2; - fcltyList[i].swtrmtZoneAreaDc3 = fcltyRes[0].swtrmtZoneAreaDc3; - fcltyList[i].swtrmtZoneAreaDc4 = fcltyRes[0].swtrmtZoneAreaDc4; - // 계획연도 - fcltyList[i].planYrDt4 = fcltyRes[0].planYrDt4; - fcltyList[i].planYr = fcltyRes[0].planYr; - fcltyList[i].planYrDc1 = fcltyRes[0].planYrDc1; - fcltyList[i].planYrDc2 = fcltyRes[0].planYrDc2; - fcltyList[i].planYrDc3 = fcltyRes[0].planYrDc3; - fcltyList[i].planYrDc4 = fcltyRes[0].planYrDc4; - } - } - + const res = await fetchProcessAreaList(pageNo, pageSize, ctpvNm, sggNm, targetYear, set); res.data.forEach((item:ProcessAreaProps) => { DataForm({ type: 'float1', column: 'fctCpc', item:item as unknown as Record}); }) diff --git a/apps/fo/app/store/processFacility/index.tsx b/apps/fo/app/store/processFacility/index.tsx index 216fad59a..f4184865d 100644 --- a/apps/fo/app/store/processFacility/index.tsx +++ b/apps/fo/app/store/processFacility/index.tsx @@ -431,30 +431,6 @@ export const fetchFacilityListInit = async (pageNo:number, pageSize:number, part } }; -// 시설정보 리스트 데이터 호출(구분 선택 후 시설명 있을 경우) 처리구역용. pageNo, pageSize, ctpvNm, sggNm, targetYear, -export const fetchFacilityListArea = async (pageNo:number, pageSize:number, ctpvNm?:string, sggNm?:string, targetYear?:string ): Promise<{data:any[], count:number}> => { - try { - console.log(pageNo, pageSize ,ctpvNm, sggNm, targetYear) - const tailStr = "/A"+ (ctpvNm?"/"+ctpvNm:"/0") + (sggNm?"/"+sggNm:"/0") + "/0/0" ; - console.log(tailStr); - const url = '/prcsFclt/info/'+pageNo+'/'+pageSize+tailStr; - const res = await getFetch('fo', url); - res.data.forEach((item: Record) => { - item.daddr = item.addr ? item.addr : ''; - item.sidoNm = item.sido ? item.sido : ''; - item.sigungo = item.gugun ? item.gugun : ''; - item.swtrmtFcltNm = item.bscFctNm ? item.bscFctNm : ''; - item.location = item.daddr ? item.daddr : ''; - item.trtDstr = item.trtDstr ? item.trtDstr : ''; - }); - - return res; - } catch (error) { - console.error('시설정보 데이터를 가져오는데 실패했습니다:', error); - return {data: [], count: 0}; - } -}; - const fetchFacilityList = async (pageNo:number, pageSize:number, partValue?:string, nameCd?:string, fcltCpct?:string, oprtngSttsCd?:string, facilityPartValue?:string, facilityName?:string ): Promise<{data:facilityListProps[], count:number}> => { try { const tailStr = partValue ? '/'+ (partValue==='G' ? 'A' : partValue) + '/' + nameCd + '/' + fcltCpct + '/' + oprtngSttsCd + '/' + facilityPartValue + (facilityName && facilityName !== '' ? '/' + facilityName : '') : ''; From 09289b162269e38471ac3e4c42db93094a1a4474 Mon Sep 17 00:00:00 2001 From: jsyang Date: Thu, 30 Oct 2025 19:05:08 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EC=B2=98=EB=A6=AC=EA=B5=AC=EC=97=AD?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/pages/(with-layout)/processArea/page.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/fo/app/pages/(with-layout)/processArea/page.tsx b/apps/fo/app/pages/(with-layout)/processArea/page.tsx index ed93a777a..94be9bd0b 100644 --- a/apps/fo/app/pages/(with-layout)/processArea/page.tsx +++ b/apps/fo/app/pages/(with-layout)/processArea/page.tsx @@ -70,10 +70,12 @@ export default function ProcessArea() { unitWaterShedValue: '', middleRegionValue: '', envPartValue: '', + sidoText: '', + sigunText: '', }); - const searchProcessArea = useCallback(({ sidoValue, sigunValue}: ReturnType, pageNo: number, pageCnt:number=20) => { - searchProcessAreaList(pageNo, pageCnt, sidoValue, sigunValue, searchYearValue); + const searchProcessArea = useCallback(({ sidoText, sigunText}: ReturnType, pageNo: number, pageCnt:number=20) => { + searchProcessAreaList(pageNo, pageCnt, sidoText, sigunText, searchYearValue); }, [searchProcessAreaList, searchYearValue]); // 조회