From 657361a1413e61317d0b6d515fb494c2959a5541 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 8 Jul 2025 18:44:45 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98=EB=8F=84/?=
 =?UTF-8?q?=EC=98=A8=EB=B0=B0=EC=88=98=20=EC=97=91=EC=85=80=20=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95,=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=B2=98=EB=A6=AC=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/fcltSttn/htdflSttn/page.tsx   | 20 ++--
 .../ruseFcltMng/fcltSttn/rainSttn/page.tsx    | 24 +++--
 .../ruseFcltMng/fcltSttn/htdflSttn/excel.tsx  |  4 +-
 .../ruseFcltMng/fcltSttn/htdflSttn/index.tsx  | 64 ++++++++-----
 .../ruseFcltMng/fcltSttn/rainSttn/excel.tsx   |  4 +-
 .../ruseFcltMng/fcltSttn/rainSttn/index.tsx   | 93 +++++++++++--------
 .../ruseFcltMng/fcltSttn/rswtSttn/index.tsx   | 15 ---
 7 files changed, 129 insertions(+), 95 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
index b943e8b4f..344234af5 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
@@ -39,7 +39,7 @@ export default function HtdflSttn() {
   const { code, htdflSttn, htdflSttnSearch, initHtdfl } = useWrStore(
     (state) => state
   );
-  const { htdflSttnRes } = htdflSttn;
+  const { htdflSttnRes, htdflSttnResCount } = htdflSttn;
 
   const ref = useRef<ReturnType>({} as ReturnType);
 
@@ -61,8 +61,8 @@ export default function HtdflSttn() {
   const excelClick = useCallback(() => {
     // 최신 검색 조건 반영
     const con = getConValue();
-    htdflSttnSearch(true, 1, "20", String(con), fcltNm, code.cityCd, code.sggCd);
-  }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd]);
+    htdflSttnSearch(true, pageNation, String(htdflSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd);
+  }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm, htdflSttnResCount]);
 
   useEffect(() => {
     htdflSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
@@ -120,7 +120,7 @@ export default function HtdflSttn() {
 
   useEffect(() => {
     if (!htdflSttn.isInit) {
-      initHtdfl(1, "20", "0", fcltNm, code.cityCd, code.sggCd);
+      initHtdfl(false, 1, "20", "0", fcltNm, code.cityCd, code.sggCd);
     }
   }, [htdflSttn.isInit, initHtdfl]);
 
@@ -152,7 +152,10 @@ export default function HtdflSttn() {
                     label="시도"
                     selectClass={""}
                     selectArray={code.cityCd}
-                    onSelectValue={getSelCity}
+                    onSelectValue={(val) => {
+                      getSelCity(val)
+                      setPageNation(1)
+                    }}
                   />
                   <SelectBox
                     className="col-span-2 w-1/6 h-full text-2xl ml-4"
@@ -160,7 +163,10 @@ export default function HtdflSttn() {
                     selectClass={""}
                     selectArray={selectSgg || []}
                     value={objSearch.sgg} // value props 추가
-                    onSelectValue={getSgg}
+                    onSelectValue={(val) => {
+                      getSgg(val)
+                      setPageNation(1)
+                    }}
                   />
                   <div className="col-span-2 flex flex-row space-x-2">
                     <Label className="w-28 mt-2 text-xl text-gray-600">
@@ -219,7 +225,7 @@ export default function HtdflSttn() {
                 }
                 headlist={htdflSttn.htdflSttHeadList}
                 pageSize={20}
-                total={100000}
+                total={htdflSttnResCount || 0}
                 cellClick={(index: number | undefined, headId: string) => {
                   cellClick(index ?? undefined, headId);
                 }}
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
index 0b6dffe07..27d7dfa94 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
@@ -39,7 +39,7 @@ export default function RainSttn() {
   const { code, rainSttn, rainSttnSearch, rainSttnInit } = useWrStore(
     (state) => state
   );
-  const { rainSttnRes } = rainSttn;
+  const { rainSttnRes, rainSttnResCount } = rainSttn;
   const ref = useRef<ReturnType>({} as ReturnType);
 
   const [pageNation, setPageNation] = useState(1);
@@ -96,7 +96,7 @@ export default function RainSttn() {
 
   useEffect(() => {
     if (!rainSttn.isInit) {
-      rainSttnInit(1, "20", "0", fcltNm, code.cityCd, code.sggCd);
+      rainSttnInit(false, 1, "20", "0", fcltNm, code.cityCd, code.sggCd);
     }
   }, [rainSttn.isInit, rainSttnInit]);
 
@@ -132,7 +132,7 @@ export default function RainSttn() {
   }, [code, rainSttnRes, rainSttn.rainSttHeadList]);
 
   useEffect(() => {
-    rainSttnSearch(pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
+    rainSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
   }, [pageNation]);
 
   useEffect(() => {
@@ -150,8 +150,8 @@ export default function RainSttn() {
   const excelClick = useCallback(() => {
     // 최신 검색 조건 반영
     const con = getConValue();
-    rainSttnSearch(1, "10000", String(con), fcltNm, code.cityCd, code.sggCd);
-  }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd]);
+    rainSttnSearch(true, pageNation, String(rainSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd);
+  }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm, rainSttnResCount]);
 
   return (
     <>
@@ -167,7 +167,10 @@ export default function RainSttn() {
                     label="시도"
                     selectClass={""}
                     selectArray={code.cityCd}
-                    onSelectValue={getSelCity}
+                    onSelectValue={(val) => {
+                      getSelCity(val)
+                      setPageNation(1)
+                    }}
                   />
                   <SelectBox
                     className="col-span-2 w-1/6 h-full text-2xl ml-4"
@@ -175,7 +178,10 @@ export default function RainSttn() {
                     selectClass={""}
                     selectArray={selectSgg || []}
                     value={objSearch.sgg} // value props 추가
-                    onSelectValue={getSgg}
+                    onSelectValue={(val) => {
+                      getSgg(val)
+                      setPageNation(1)
+                    }}
                   />
                   <div className="col-span-2 flex flex-row space-x-2">
                     <Label className="w-28 mt-2 text-xl text-gray-600">
@@ -197,7 +203,7 @@ export default function RainSttn() {
                     size={"sm"}
                     onClick={() => {
                       const con = getConValue();
-                      rainSttnSearch(pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
+                      rainSttnSearch(false, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
                     }}
                   >
                     조회
@@ -234,7 +240,7 @@ export default function RainSttn() {
                 }
                 headlist={rainSttn.rainSttHeadList}
                 pageSize={20}
-                total={100000}
+                total={rainSttnResCount || 0}
                 cellClick={(index: number | undefined, headId: string) => { cellClick(index ?? undefined, headId) }}
                 onPageChange={setPageNation}
               ></UiTable>
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel.tsx
index 591623911..1ae5f56cc 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel.tsx
@@ -2,13 +2,13 @@ import type { SelectDataType } from "@common/business_components/ui";
 import type { customHtdflBdst } from "../../fcltReg/htdflReg";
 
 export const excelHtdflSttnParsing = (
-    data: customHtdflBdst[],
+    excel: customHtdflBdst[],
     sidoCode: SelectDataType[],
     sggCode: SelectDataType[]
 ): string[][] => {
     const excelExportData: string[][] = [];
 
-    data.forEach((item) => {
+    excel.data.forEach((item) => {
         excelExportData.push([
             sidoCode.find((sido) => sido.val === item.ctpvCd.toString())?.text ?? "",
             sggCode.find((sgg) => sgg.val === item.sggCd.toString())?.text ?? "",
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
index 229b4fe2a..29f68a6d6 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
@@ -4,7 +4,7 @@ import type { sttnHeadListType } from "../rainSttn/headList";
 import type { z } from "zod";
 import { controlHeadView } from "../rainSttn";
 import type { customHtdflBdst } from "../../fcltReg/htdflReg";
-import { fetchType, getFetch } from "@/components/lib/api";
+import { fetchType, getFetch, getFetchWithCount } from "@/components/lib/api";
 import type { SelectDataType } from "@common/business_components/ui";
 import { excelHtdflSttnParsing } from "./excel";
 
@@ -18,16 +18,16 @@ export type htdflSttnState = {
     htdflSttNodeList: CommonTableProps[];
     htdflSttnRes: customHtdflBdst[]
     excelList: [];
-
+    htdflSttnResCount: number;
   };
 };
 type htdflSttnActions = {
-  initHtdfl: (page: number, total: string, con: string, txt: string,
-        sidoCode: SelectDataType[],
-        sggCode: SelectDataType[]) => void;
-  htdflSttnSearch: (isExcel:boolean, page: number, total: string, con: string, txt: string,
-      sidoCode: SelectDataType[],
-      sggCode: SelectDataType[]) => void;
+  initHtdfl: (isExcel: boolean, page: number, total: string, con: string, txt: string,
+    sidoCode: SelectDataType[],
+    sggCode: SelectDataType[]) => void;
+  htdflSttnSearch: (isExcel: boolean, page: number, total: string, con: string, txt: string,
+    sidoCode: SelectDataType[],
+    sggCode: SelectDataType[]) => void;
   htdflChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
@@ -42,12 +42,13 @@ export const htdflSttnStateExport: htdflSttnState = {
     htdflSttnRes: [],
     excelList: [],
     isInit: false,
+    htdflSttnResCount: 1,
   },
 };
 const initFetch = async (page: number, total: string, con: string, txt: string,
   sidoCode: SelectDataType[],
   sggCode: SelectDataType[]) => {
-  const htdflRes = await getFetch(
+  const htdflRes = await getFetchWithCount(
     "wr",
     `/drain/facilityList` +
     (page ? `/${page}` : "/1") +
@@ -63,30 +64,45 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
   set: any
 ) => {
   return {
-    initHtdfl: async (page: number, total: string, con: string, txt: string,
+    initHtdfl: async (isExcel: boolean, page: number, total: string, con: string, txt: string,
       sidoCode: SelectDataType[],
       sggCode: SelectDataType[]) => {
       try {
         const htdflSttnRes = await initFetch(page, total, con, txt, sidoCode, sggCode);
-        set((state: htdflSttnState) => {
-          return {
-            ...state,
-            htdflSttn: {
-              ...state.htdflSttn,
-              htdflSttnRes: htdflSttnRes,
-              isInit: false,
-            },
-          };
-        });
+        if (isExcel) {
+          const htdflExcel = excelHtdflSttnParsing(htdflSttnRes, sidoCode, sggCode);
+          set((state: htdflSttnState) => {
+            return {
+              ...state,
+              htdflSttn: {
+                ...state.htdflSttn,
+                excelList: htdflExcel,
+                htdflSttnResCount: htdflSttnRes.count
+              },
+            };
+          });
+        } else {
+          set((state: htdflSttnState) => {
+            return {
+              ...state,
+              htdflSttn: {
+                ...state.htdflSttn,
+                htdflSttnRes: htdflSttnRes.data,
+                htdflSttnResCount: htdflSttnRes.count,
+                isInit: false,
+              },
+            };
+          });
+        }
       } catch (error) {
         console.log(error);
       }
     },
-    htdflSttnSearch: async (isExcel:boolean, page: number, total: string, con: string, txt: string,
+    htdflSttnSearch: async (isExcel: boolean, page: number, total: string, con: string, txt: string,
       sidoCode: SelectDataType[],
       sggCode: SelectDataType[]) => {
       try {
-        const htdflSttnRes = await getFetch(
+        const htdflSttnRes = await getFetchWithCount(
           fetchType.WR,
           `/drain/facilityList` +
           (page ? `/${page}` : "/1") +
@@ -103,6 +119,7 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
               htdflSttn: {
                 ...state.htdflSttn,
                 excelList: htdflExcel,
+                htdflSttnResCount: htdflSttnRes.count
               },
             };
           });
@@ -112,7 +129,8 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
               ...state,
               htdflSttn: {
                 ...state.htdflSttn,
-                htdflSttnRes: htdflSttnRes,
+                htdflSttnRes: htdflSttnRes.data,
+                htdflSttnResCount: htdflSttnRes.count,
                 isInit: false,
               },
             };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx
index 13530a81f..d2e39aa28 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/excel.tsx
@@ -2,13 +2,13 @@ import type { SelectDataType } from "@common/business_components/ui";
 import type { customRainBdst } from "../../fcltReg/rainReg";
 
 export const excelRainSttnParsing = (
-    data: customRainBdst[],
+    excel: customRainBdst[],
     sidoCode: SelectDataType[],
     sggCode: SelectDataType[]
 ): string[][] => {
     const excelExportData: string[][] = [];
 
-    data.forEach((item) => {
+    excel.data.forEach((item) => {
         excelExportData.push([
             sidoCode.find((sido) => sido.val === item.ctpvCd.toString())?.text ?? "",
             sggCode.find((sgg) => sgg.val === item.sggCd.toString())?.text ?? "",
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
index eb2c08d37..3ad7090ec 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
@@ -1,5 +1,5 @@
 import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import { fetchType, getFetch } from "@/components/lib/api";
+import { fetchType, getFetch, getFetchWithCount } from "@/components/lib/api";
 import {
   type customRainBdst,
 } from "../../fcltReg/rainReg";
@@ -96,15 +96,16 @@ export type rainSttnState = {
     rainChkRes: rainChkZodType
     excelList: [];
     isInit: boolean;
+    rainSttnResCount: number;
   };
 };
 type rainSttnActions = {
-  rainSttnInit: (page: number, total: string, con: string, txt: string,
-      sidoCode: SelectDataType[],
-      sggCode: SelectDataType[]) => void
-  rainSttnSearch: (page: number, total: string, con: string, txt: string,
-      sidoCode: SelectDataType[],
-      sggCode: SelectDataType[]) => void;
+  rainSttnInit: (isExcel: boolean, page: number, total: string, con: string, txt: string,
+    sidoCode: SelectDataType[],
+    sggCode: SelectDataType[]) => void
+  rainSttnSearch: (isExcel: boolean, page: number, total: string, con: string, txt: string,
+    sidoCode: SelectDataType[],
+    sggCode: SelectDataType[]) => void;
   rainChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
@@ -123,6 +124,7 @@ export const rainSttnStateExport: rainSttnState = {
     rainChkRes: rainChkRes,
     excelList: [],
     isInit: false,
+    rainSttnResCount: 1,
   },
 };
 
@@ -130,12 +132,12 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
   set: any
 ) => {
   return {
-    rainSttnInit: async (page: number, total: string, con: string, txt: string,
+    rainSttnInit: async (isExcel: boolean, page: number, total: string, con: string, txt: string,
       sidoCode: SelectDataType[],
       sggCode: SelectDataType[]) => {
       try {
 
-        const rainSttnRes = await getFetch(
+        const rainSttnRes = await getFetchWithCount(
           fetchType.WR,
           `/reuseFc/rainyInfoList` +
           (page ? `/${page}` : "/1") +
@@ -143,33 +145,7 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
           (con ? `/${con}` : "/0") +
           (txt ? `/${txt}` : "")
         );
-        set((state: rainSttnState) => {
-          return {
-            ...state,
-            rainSttn: {
-              ...state.rainSttn,
-              rainSttnRes: rainSttnRes,
-              isInit: false,
-            },
-          };
-        });
-      } catch (e) {
-        console.log(e)
-      }
-    },
-    rainSttnSearch: async (page: number, total: string, con: string, txt: string,
-      sidoCode: SelectDataType[],
-      sggCode: SelectDataType[]) => {
-      try {
-        const rainSttnRes = await getFetch(
-          fetchType.WR,
-          `/reuseFc/rainyInfoList` +
-          (page ? `/${page}` : "/1") +
-          (total ? `/${total}` : "/20") +
-          (con ? `/${con}` : "/0") +
-          (txt ? `/${txt}` : "")
-        );
-        if (Number(total) > 9000) {
+        if (isExcel) {
           const rainExcel = excelRainSttnParsing(rainSttnRes, sidoCode, sggCode);
           set((state: rainSttnState) => {
             return {
@@ -177,6 +153,48 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
               rainSttn: {
                 ...state.rainSttn,
                 excelList: rainExcel,
+                rainSttnResCount: rainSttnRes.count,
+              },
+            };
+          });
+        } else {
+          set((state: rainSttnState) => {
+            return {
+              ...state,
+              rainSttn: {
+                ...state.rainSttn,
+                rainSttnRes: rainSttnRes.data,
+                rainSttnResCount: rainSttnRes.count,
+                isInit: false,
+              },
+            };
+          });
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    rainSttnSearch: async (isExcel: boolean, page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
+      try {
+        const rainSttnRes = await getFetchWithCount(
+          fetchType.WR,
+          `/reuseFc/rainyInfoList` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
+        );
+        if (isExcel) {
+          const rainExcel = excelRainSttnParsing(rainSttnRes, sidoCode, sggCode);
+          set((state: rainSttnState) => {
+            return {
+              ...state,
+              rainSttn: {
+                ...state.rainSttn,
+                excelList: rainExcel,
+                rainSttnResCount: rainSttnRes.count,
               },
             };
           });
@@ -186,7 +204,8 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
               ...state,
               rainSttn: {
                 ...state.rainSttn,
-                rainSttnRes: rainSttnRes,
+                rainSttnRes: rainSttnRes.data,
+                rainSttnResCount: rainSttnRes.count,
                 isInit: false,
               },
             };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
index fd38b5bf3..716b4d517 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
@@ -71,7 +71,6 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = (
           (con ? `/${con}` : "/0") +
           (txt ? `/${txt}` : "")
         );
-        console.log("rswtSttnResㅇㅇ", rswtSttnRes)
         if (isExcel) {
         const rswtExcel = excelRSwtSttnParsing(rswtSttnRes, sidoCode, sggCode);
           set((state: rswtSttnState) => {
@@ -97,20 +96,6 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = (
               },
             };
           });
-        // }
-
-        // set((state: rswtSttnState) => {
-        //   return {
-        //     ...state,
-        //     rswtSttn: {
-        //       ...state.rswtSttn,
-        //       rswtSttnRes: rswtSttnRes.data,
-        //       rswtSttnResCount: rswtSttnRes.count,
-        //       excelList: rswtExcel,
-        //       isInit: false,
-        //     },
-        //   };
-        // });
       } catch (e) {
         console.log(e)
       }