From c5830e0326f7804533abda9d51e86317928b0425 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Tue, 1 Jul 2025 10:26:37 +0900
Subject: [PATCH 01/44] =?UTF-8?q?=EC=88=98=EC=9A=94=EC=B2=98=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
index 152441c70..17983edf2 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
@@ -504,7 +504,7 @@ export function PbnstBuseForm({
                       size={commonButonSize}
                       className="mt-6 mr-3"
                     >
-                      수요항목 추가
+                      수요처 추가
                     </Button>
                     <Button
                       type="button"
@@ -517,7 +517,7 @@ export function PbnstBuseForm({
                       size={commonButonSize}
                       className="mt-6"
                     >
-                      수요처 추가
+                      수요처 신규등록
                     </Button>
                   </div>
                   {(

From b0dfec9825022ffc2ab85ea10b8c1f75171d916e Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 1 Jul 2025 11:27:09 +0900
Subject: [PATCH 02/44] =?UTF-8?q?=EC=9A=B0=EB=A6=AC=EB=8F=99=EB=84=A4?=
 =?UTF-8?q?=EA=B0=80=EB=AD=84=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMng/drgtSttn/page.tsx    |  84 ++++++----
 apps/wr/app/store/matDmd/drgtSttn/index.tsx   | 148 +++++++++++-------
 .../ui/modal/coMat/drgtDetailModal.tsx        |  56 ++++---
 3 files changed, 183 insertions(+), 105 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
index d7c5170b2..2f07dd6de 100644
--- a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
@@ -6,15 +6,15 @@ import { drgtHeadListExport } from "@/app/store/matDmd/drgtSttn/headList";
 import { excelDownload, getCity } from "@/components/lib/func/commom";
 import DrgtDetailModal from "@/components/ui/modal/coMat/drgtDetailModal";
 import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
-import { ContentsDiv, DateMonthPicker, SearchDiv, SearchFormLeft, SearchFormRight, SelectBox, Title, UiModal, UiTable, type SelectDataType } from "@common/business_components/ui";
+import { ContentsDiv, DateMonthPicker, downloadExcel, SearchDiv, SearchFormLeft, SearchFormRight, SelectBox, Title, UiModal, UiTable, type SelectDataType } from "@common/business_components/ui";
 import { MonthPicker } from "@common/business_components/ui/date_month_picker/mothPicker";
 import ListDiv from "@common/business_components/ui/list_div";
-import { Button, DatePicker, Label } from "@common/components/ui";
+import { Button, DatePicker, Label, ScrollArea } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
 import { toast, Toaster } from "react-hot-toast";
 
 export default function DrgtSttn() {
-    const { code, drgt, drgtSearch, drgtModalSearch } = useWrStore((state) => state);
+    const { code, drgt, drgtSearch, drgtModalSearch, drgtInit } = useWrStore((state) => state);
     const { drgtRes, drgtMoRes } = drgt;
     const [fromDate, setFromDate] = useState<string>();
     const [toDate, setToDate] = useState<string>();
@@ -22,6 +22,8 @@ export default function DrgtSttn() {
     const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
     const [tableData, setTableData] = useState<customDrgt[]>();
     const [selectedSgg, setSelectedSgg] = useState<string>('');
+    const [excelData, setExcelData] = useState<any[]>();
+    const [num, setNum] = useState<string>();
     const [drgtModal, setDrgtModal] = useState<{
         isOpen: boolean;
         data: customDrgt | undefined;
@@ -35,6 +37,39 @@ export default function DrgtSttn() {
         }
     }
 
+    const excelClick = () => {
+        downloadExcel({
+            data: excelData ?? [],
+            fileName: "우리동네가뭄 현황",
+            sheetNameArray: ["Sheet1"],
+            headerRange: "A1:G1"
+        })
+    }
+
+    useEffect(() => {
+        if (!drgt.isInit) {
+            drgtInit();
+        }
+    }, [drgt.isInit, drgtInit]);
+
+    useEffect(() => {
+        const resData = Array.isArray(drgtRes) ? drgtRes : [drgtRes];
+        const data = Array.isArray(resData)
+            ? resData.map((item: customDrgt) => {
+                return {
+                    "시도": item.ctpvCd,
+                    "시군구": item.sggNm,
+                    "정상(횟수)": item.normal,
+                    "관심(횟수)": item.attention,
+                    "주의(횟수)": item.caution,
+                    "관심+주의(횟수)": item.warning,
+                    "가뭄순위": item.ranking,
+                }
+            }) : [];
+        setExcelData(data)
+        setTableData(drgtRes)
+    }, [drgtRes])
+
     useEffect(() => {
         if (drgtMoRes && drgtMoRes.length > 0) {
             setDrgtModal({ isOpen: true, data: drgtMoRes });
@@ -65,15 +100,6 @@ export default function DrgtSttn() {
         setObjSearch({ ...objSearch, sgg: String(val) });
     };
 
-    const excelClick = useCallback(() => {
-        excelDownload(
-            [[]],
-            "우리동네가뭄",
-            "sample_drgtSttn.xlsx",
-            "A1:H1"
-        );
-    }, []);
-
     useEffect(() => {
         if (fromDate === undefined && toDate === undefined) {
             const today = new Date();
@@ -101,7 +127,7 @@ export default function DrgtSttn() {
                                         onSelectValue={getSelCity}
                                     />
                                     <SelectBox
-                                        className="col-span-2 w-1/6 h-full text-2xl"
+                                        className="col-span-2 w-1/6 h-full text-2xl ml-8"
                                         label="시군구"
                                         selectClass={""}
                                         selectArray={selectSgg || []}
@@ -110,7 +136,7 @@ export default function DrgtSttn() {
                                     />
                                     <div className="col-span-5 w-auto">
                                         <div className="flex flex-row items-center">
-                                            <Label className="text-xl text-gray-600">조회기간</Label>
+                                            <Label className="text-xl text-gray-600 ml-8">조회기간</Label>
                                             <div className="flex flex-row w-1/4">
                                                 <DateMonthPicker
                                                     field={{
@@ -125,8 +151,9 @@ export default function DrgtSttn() {
                                                             setFromDate(formatted);
                                                         }
                                                     }}
+                                                    selectClass="ml-4 text-2xl"
                                                 />
-                                                <span>~</span>
+                                                <span className="ml-2 text-center">~</span>
                                                 <DateMonthPicker
                                                     field={{
                                                         value: toDate,
@@ -140,6 +167,7 @@ export default function DrgtSttn() {
                                                             setToDate(formatted);
                                                         }
                                                     }}
+                                                    selectClass="ml-4"
                                                 />
                                             </div>
                                         </div>
@@ -148,7 +176,7 @@ export default function DrgtSttn() {
                             </SearchFormLeft>
                             <SearchFormRight
                                 className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
-                                <div className="flex flex-row space-x-2">
+                                <div className="flex flex-row space-x-2 items-center">
                                     <Button
                                         size={"sm"}
                                         onClick={(e) => {
@@ -199,17 +227,19 @@ export default function DrgtSttn() {
                 <div className="grid grid-cols-6 gap-4 ">
                     <div className="col-span-6">
                         <ListDiv>
-                            <UiTable
-                                headName={[]}
-                                tableData={drgtRes || []}
-                                headlist={drgtHeadListExport}
-                                pageSize={20}
-                                total={10000}
-                                cellClick={(index: number | undefined, headId: string) => {
-                                    cellClick(index ?? undefined, headId);
-                                }}
-                                onPageChange={() => { }}
-                            ></UiTable>
+                            <ScrollArea className="h-[66vh]">
+                                <UiTable
+                                    headName={undefined}
+                                    tableData={tableData || []}
+                                    headlist={drgtHeadListExport}
+                                    pageSize={14}
+                                    total={0}
+                                    cellClick={(index: number | undefined, headId: string) => {
+                                        cellClick(index ?? undefined, headId);
+                                    }}
+                                    onPageChange={() => { }}
+                                ></UiTable>
+                            </ScrollArea>
                         </ListDiv>
                     </div>
                 </div>
diff --git a/apps/wr/app/store/matDmd/drgtSttn/index.tsx b/apps/wr/app/store/matDmd/drgtSttn/index.tsx
index 698ba5984..053bb12fc 100644
--- a/apps/wr/app/store/matDmd/drgtSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/drgtSttn/index.tsx
@@ -14,10 +14,12 @@ export type drgtState = {
     drgtHeadList: CommonTableProps[];
     drgtRes: customDrgt[];
     drgtMoRes: customDrgt[];
+    isInit: boolean;
   }
 }
 
 type drgtActions = {
+  drgtInit: () => void
   drgtSearch: (fromDate: string, toDate: string, sido: string, sgg: string) => void
   drgtModalSearch: (fromDate: string, toDate: string, sgg: string) => void
 };
@@ -29,72 +31,105 @@ export const drgtStateExport: drgtState = {
     drgtHeadList: drgtHeadList,
     drgtRes: drgtRes,
     drgtMoRes: drgtRes,
+    isInit: false,
   }
 }
 
+const initFetch = async (fromDate: string, toDate: string, sido: string, sgg: string) => {
+
+  let searchUrl = "";
+
+  if (sido === "" || sido === "전체") {
+    searchUrl = `/il/getDataCount/${fromDate}/${toDate}`;
+  } else {
+    searchUrl = `/il/getDataCount/${fromDate}/${toDate}/${sido}/${sgg}`;
+  }
+
+  const drgtData = await getFetch(
+    fetchType.WR,
+    searchUrl
+  );
+
+  //주의, 관심, 정상 추출
+  const statusData = Array.from(
+    new Set(drgtData.map((e) => e.lvngMfgUswtrDrgtInfo))
+  );
+
+  const statusMap = drgtData.reduce((acc: any, { sggNm, lvngMfgUswtrDrgtInfo: status, countDrgt }: { sggNm: string; lvngMfgUswtrDrgtInfo: string; countDrgt: number }) => {
+    if (!acc[sggNm]) {
+      acc[sggNm] = { sggNm, ...Object.fromEntries(statusData.map((e) => [e, 0])) };
+    }
+    acc[sggNm][status] = Number(countDrgt);
+    return acc;
+  }, {});
+  const data = Object.values(statusMap);
+
+  const formatStatus = data.map((item) => {
+    const attention = item['관심'] || 0;
+    const caution = item['주의'] || 0;
+    return {
+      sggNm: item.sggNm,
+      normal: String(item['정상'] || 0),
+      caution: String(caution),
+      attention: String(attention),
+      warning: String(attention + caution),
+    };
+  });
+
+  const ranking = Array.from(
+    new Set(formatStatus.map(e => Number(e.warning)))
+  ).sort((a, b) => b - a);
+
+  const rankData = ranking.reduce((acc, val, idx) => {
+    acc[val] = idx + 1;
+    return acc;
+  }, {});
+
+  const drgtRes = formatStatus.map(item => ({
+    ...item,
+    warning: String(item.warning),
+    ranking: rankData[Number(item.warning)],
+  }));
+
+  return drgtRes;
+
+}
+
+
 export const drgtActionsExport: (set: any) => drgtActions = (
   set: any
 ) => {
   return {
+    drgtInit: async () => {
+      try {
+        const today = new Date();
+        const year = today.getFullYear();
+        const month = String(today.getMonth() + 1).padStart(2, '0');
+        const formatted = `${year}${month}`;
+        const fromDate = formatted;
+        const toDate = formatted;
+
+        //FIXME: 페이지 처음 로딩될때 데이터 보려고 6월로 박아놓음 이거 fromDate로 고치기
+        const drgtRes = await initFetch("202506", toDate, "", "");
+        set((state: drgtState) => {
+          return {
+            ...state,
+            drgt: {
+              ...state.drgt,
+              drgtRes: drgtRes,
+              isInit: false,
+            },
+          }
+        });
+      } catch (e) {
+        console.log(e)
+      }
+    },
     drgtSearch: async (fromDate: string, toDate: string, sido: string, sgg: string) => {
       try {
-        let searchUrl = "";
 
-        if (sido === "" || sido === "전체") {
-          searchUrl = `/il/getDataCount/${fromDate}/${toDate}`;
-        } else {
-          searchUrl = `/il/getDataCount/${fromDate}/${toDate}/${sido}/${sgg}`;
-        }
+        const drgtRes = await initFetch(fromDate, toDate, sido, sgg);
 
-        console.log("searchUrl", searchUrl);
-
-        const drgtData = await getFetch(
-          fetchType.WR,
-          searchUrl
-        );
-
-        console.log("drgtRes", drgtData)
-
-        //주의, 관심, 정상 추출
-        const statusData = Array.from(
-          new Set(drgtData.map((e) => e.lvngMfgUswtrDrgtInfo))
-        );
-
-        const statusMap = drgtData.reduce((acc: any, { sggNm, lvngMfgUswtrDrgtInfo: status, countDrgt }: { sggNm: string; lvngMfgUswtrDrgtInfo: string; countDrgt: number }) => {
-          if (!acc[sggNm]) {
-            acc[sggNm] = { sggNm, ...Object.fromEntries(statusData.map((e) => [e, 0])) };
-          }
-          acc[sggNm][status] = Number(countDrgt);
-          return acc;
-        }, {});
-        const data = Object.values(statusMap);
-
-        const formatStatus = data.map((item) => {
-          const attention = item['관심'] || 0;
-          const caution = item['주의'] || 0;
-          return {
-            sggNm: item.sggNm,
-            normal: String(item['정상'] || 0),
-            caution: String(caution),
-            attention: String(attention),
-            warning: String(attention + caution),
-          };
-        });
-
-        const ranking = Array.from(
-          new Set(formatStatus.map(e => Number(e.warning)))
-        ).sort((a, b) => b - a);
-
-        const rankData = ranking.reduce((acc, val, idx) => {
-          acc[val] = idx + 1;
-          return acc;
-        }, {});
-
-        const drgtRes = formatStatus.map(item => ({
-          ...item,
-          warning: String(item.warning),
-          ranking: rankData[Number(item.warning)],
-        }));
         set((state: drgtState) => {
           return {
             ...state,
@@ -115,10 +150,7 @@ export const drgtActionsExport: (set: any) => drgtActions = (
           `/il/getData/${fromDate}/${toDate}/${sgg}/${sgg}`
         );
 
-        console.log("drgtMoData", drgtMoData)
-
         const drgtMoRes = drgtMoData.map((item) => {
-          console.log("item", item)
           const year = item.anlsYmd.slice(0, 4);
           const month = item.anlsYmd.slice(4, 6);
           const drgtState = item.lvngMfgUswtrDrgtInfo;
diff --git a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
index 1be95fae6..102292ccf 100644
--- a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
+++ b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
@@ -4,24 +4,38 @@ import { btnClass } from "@/app/store/common/code"
 import type { customDrgt } from "@/app/store/matDmd/drgtSttn"
 import { drgtDetailHeadListExport } from "@/app/store/matDmd/drgtSttn/headList"
 import { excelDownload } from "@/components/lib/func/commom"
-import { Title, UiTable } from "@common/business_components/ui"
+import { downloadExcel, Title, UiTable } from "@common/business_components/ui"
 import ListDiv from "@common/business_components/ui/list_div"
-import { Button } from "@common/components/ui"
-import { useCallback, useEffect } from "react"
+import { Button, ScrollArea } from "@common/components/ui"
+import { useCallback, useEffect, useState } from "react"
 
 export default function DrgtDetailModal({
     data,
 }: {
     data: customDrgt;
 }) {
-    const excelClick = useCallback(() => {
-        excelDownload(
-            [[]],
-            "우리동네가뭄",
-            "sample_drgtSttn.xlsx",
-            "A1:H1"
-        );
-    }, []);
+    const [excelData, setExcelData] = useState<any[]>();
+    const excelClick = () => {
+        downloadExcel({
+            data: excelData ?? [],
+            fileName: "우리동네가뭄 상세현황",
+            sheetNameArray: ["Sheet1"],
+            headerRange: "A1:C1"
+        })
+    }
+
+    useEffect(() => {
+        const resData = Array.isArray(data) ? data : [data];
+        const exData = Array.isArray(resData)
+            ? resData.map((item: customDrgt) => {
+                return {
+                    "년": item.year,
+                    "월": item.month,
+                    "가뭄상태": item.drgtState,
+                }
+            }) : [];
+        setExcelData(exData)
+    }, [data])
 
     return (
         <>
@@ -43,15 +57,17 @@ export default function DrgtDetailModal({
                     <div className="grid grid-cols-6 gap-4 ">
                         <div className="col-span-6">
                             <ListDiv>
-                                <UiTable
-                                    headName={[]}
-                                    tableData={data}
-                                    headlist={drgtDetailHeadListExport}
-                                    pageSize={10}
-                                    total={10000}
-                                    cellClick={(index: number | undefined, headId: string) => { }}
-                                    onPageChange={() => { }}
-                                ></UiTable>
+                                <ScrollArea className="h-[63vh]">
+                                    <UiTable
+                                        headName={undefined}
+                                        tableData={data}
+                                        headlist={drgtDetailHeadListExport}
+                                        pageSize={10}
+                                        total={10000}
+                                        cellClick={(index: number | undefined, headId: string) => { }}
+                                        onPageChange={() => { }}
+                                    ></UiTable>
+                                </ScrollArea>
                             </ListDiv>
                         </div>
                     </div>

From d16645d0aa7b56319ab25832d52377f40bfede92 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 1 Jul 2025 16:34:43 +0900
Subject: [PATCH 03/44] =?UTF-8?q?=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=8B=A4=EC=A0=81=20=EB=93=B1=EB=A1=9D=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95,=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95,?=
 =?UTF-8?q?=20=ED=85=8C=EC=9D=B4=EB=B8=94=20merge=20=EC=B6=94=EA=B0=80,=20?=
 =?UTF-8?q?=EC=86=8C=EA=B3=84=20=EB=B0=8F=20=EC=B4=9D=ED=95=A9=EA=B3=84=20?=
 =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prfmncReg/pbnstPrfmncReg/page.tsx         |  38 +++--
 .../prfmncReg/pbnstPrfmncReg/headList.tsx     |  27 ++--
 apps/wr/components/lib/func/TableData.tsx     | 151 ++++++++++++------
 .../pbnPrfExcelModal/pbnPrfExcelModal.tsx     | 123 +++++++-------
 apps/wr/public/sample_pbnstPrfmncReg.xlsx     | Bin 13777 -> 13806 bytes
 5 files changed, 208 insertions(+), 131 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
index 6be50a8c5..10dd7ccb6 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
@@ -25,7 +25,7 @@ import {
 } from "@common/components/ui";
 import { useState, useEffect, useCallback } from "react";
 import { set } from "react-hook-form";
-import { Toaster } from "react-hot-toast";
+import toast, { Toaster } from "react-hot-toast";
 import { headMakeprfmnc } from "../chkgdnReg/TableHead";
 import { InputTableBody } from "@/components/lib/func/TableData";
 import {
@@ -51,8 +51,8 @@ export default function prfmncPrfmncReg() {
   }>({ isModal: false, data: {} as FcPrfType });
   const [inputData, setInputData] = useState<any[]>();
   const [pbnstRuseFcltPk, setPbnstRuseFcltPk] = useState<string>();
-  const [pageNation , setPageNation] = useState<number>(1);
-
+  const [pageNation, setPageNation] = useState<number>(1);
+  const [cellNum, setCellNum] = useState<number>();
   const [searchYear, setSearchYear] = useState<string>(
     String(new Date().getFullYear())
   );
@@ -76,7 +76,7 @@ export default function prfmncPrfmncReg() {
       );
       prfmncHasuInit(String(pageNation), "41");
     }
-  }, [inputData, searchYear, pbnstRuseFcltPk,prfmncHasuInit,pageNation]);
+  }, [inputData, searchYear, pbnstRuseFcltPk, prfmncHasuInit, pageNation]);
 
 
 
@@ -88,10 +88,16 @@ export default function prfmncPrfmncReg() {
           isModal: false,
           data: prfmncRes[index] || ({} as FcPrfType),
         });
-        const inUsageData = structuredClone(initValInUsage);
-        const outUsageData = structuredClone(initValOutUsage);
-        const inSubtotal = structuredClone(subTotalObj);
-        const outSubtotal = structuredClone(subTotalObj);
+        const inUsageData = structuredClone(initValInUsage).map(row => ({
+          ...row,
+          구분: "장내용수",
+        }));
+        const outUsageData = structuredClone(initValOutUsage).map(row => ({
+          ...row,
+          구분: "장외용수",
+        }));
+        const inSubtotal = { ...structuredClone(subTotalObj), 구분: "장내용수" };
+        const outSubtotal = { ...structuredClone(subTotalObj), 구분: "장외용수" };
         if (prfmncRes[index]?.prfList) {
           prfmncRes[index].prfList?.forEach((prfItem) => {
             const month = Number(prfItem?.ym?.slice(4)); // "MM"
@@ -127,7 +133,7 @@ export default function prfmncPrfmncReg() {
           });
           inUsageData.push(inSubtotal);
           outUsageData.push(outSubtotal);
-          const usageTotalObj: { [key: string]: any } = structuredClone(totalObj);
+          const usageTotalObj: { [key: string]: any } = { ...structuredClone(totalObj), 구분: "총합계", 용수명: "" };
           for (const key in usageTotalObj) {
             if (["usage", "gubun", "edit"].includes(key)) continue;
             const val =
@@ -162,7 +168,7 @@ export default function prfmncPrfmncReg() {
       <ContentsDiv>
         <div className="grid grid-cols-4 gap-4">
           <div className="col-span-4">
-            <Title title={"하수재이용 시설 등록"} />
+            <Title title={"하수재이용 실적 등록"} />
             <SearchDiv>
               <SearchFormLeft>
                 <div className="col-span-2 flex flex-row space-x-2">
@@ -197,7 +203,7 @@ export default function prfmncPrfmncReg() {
               <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
                 <div className="space-y">
                   <div className="flex flex-row space-x-2">
-                    <Button size={"sm"} onClick={(e) => {}}>
+                    <Button size={"sm"} onClick={(e) => { }}>
                       조회
                     </Button>
                     <Button
@@ -211,7 +217,12 @@ export default function prfmncPrfmncReg() {
                     <Button
                       size={"sm"}
                       onClick={() => {
-                        setIsExcelOPen({ ...isExcelOpen, isModal: true });
+                        if (cellNum === undefined) {
+                          toast.error("하수처리재이용시설을 선택해주세요.")
+                          return;
+                        } else {
+                          setIsExcelOPen({ ...isExcelOpen, isModal: true });
+                        }
                       }}
                     >
                       파일등록
@@ -238,6 +249,7 @@ export default function prfmncPrfmncReg() {
                   headName={"하수재이용시설 목록"}
                   cellClick={(index: number | undefined, headId: string) => {
                     cellClick(index, headId);
+                    setCellNum(index ?? 0);
                   }}
                   onPageChange={setPageNation}
                   children={undefined}
@@ -266,7 +278,7 @@ export default function prfmncPrfmncReg() {
         </div>
       </ContentsDiv>
       <UiModal
-        bodyClass={""}
+        bodyClass={"w-[30vw] max-w-none"}
         body={<PbnPrfExcelModal data={isExcelOpen.data}></PbnPrfExcelModal>}
         open={isExcelOpen.isModal}
         onOpenChange={() => {
diff --git a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/headList.tsx b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/headList.tsx
index 544f07516..abde1778f 100644
--- a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/headList.tsx
@@ -4,7 +4,7 @@ import type { TableUpperProps } from "../../common/type/header";
 export const pbnPrfRegExcelZod = z.object({
   ym: z.string().default(""),
   bscFctNm: z.string().default(""),
-  pbnstRuseFcltFk:z.string(),
+  pbnstRuseFcltFk: z.string(),
   pbnstRuseFcltNm: z.string().default(""),
   file: z.instanceof(File).optional(),
 });
@@ -18,20 +18,21 @@ export const pbnstPrfmncHeadListExport: TableUpperProps[] = [
 ];
 
 export const monthHeadListExport: TableUpperProps[] = [
+  { id: "구분", title: "구분", mergeCell: true },
   { id: "용수명", title: "용수명" },
   { id: "total", title: "계" },
-  { id: "1월", title: "1월" ,edit: true  },
-  { id: "2월", title: "2월" ,edit: true },
-  { id: "3월", title: "3월" ,edit: true },
-  { id: "4월", title: "4월" ,edit: true },
-  { id: "5월", title: "5월" ,edit: true },
-  { id: "6월", title: "6월" ,edit: true },
-  { id: "7월", title: "7월" ,edit: true },
-  { id: "8월", title: "8월" ,edit: true },
-  { id: "9월", title: "9월" ,edit: true },
-  { id: "10월", title: "10월" ,edit: true },
-  { id: "11월", title: "11월" ,edit: true },
-  { id: "12월", title: "12월" ,edit: true },
+  { id: "1월", title: "1월", edit: true },
+  { id: "2월", title: "2월", edit: true },
+  { id: "3월", title: "3월", edit: true },
+  { id: "4월", title: "4월", edit: true },
+  { id: "5월", title: "5월", edit: true },
+  { id: "6월", title: "6월", edit: true },
+  { id: "7월", title: "7월", edit: true },
+  { id: "8월", title: "8월", edit: true },
+  { id: "9월", title: "9월", edit: true },
+  { id: "10월", title: "10월", edit: true },
+  { id: "11월", title: "11월", edit: true },
+  { id: "12월", title: "12월", edit: true },
 ];
 
 
diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx
index dbb3aa7a6..39c8b7739 100644
--- a/apps/wr/components/lib/func/TableData.tsx
+++ b/apps/wr/components/lib/func/TableData.tsx
@@ -174,8 +174,6 @@ export const chRowspanTable = (
   );
 };
 
-
-
 export const headVisibleChange = (headList: TableUpperProps[], isEdit: boolean) => {
   return headList.forEach((head) => {
     if (head.edit !== undefined)
@@ -187,63 +185,124 @@ export const headVisibleChange = (headList: TableUpperProps[], isEdit: boolean)
   });
 }
 
-
 const handleChange = (
   rowIndex: number,
   field: any,
   value: string | number,
-  setInputData: (data:any) => void
+  setInputData: (data: any) => void
 ) => {
-  if(Number(value) < 0  ||! Number(value)){
-      value = 0;
-  }else{
+  if (Number(value) < 0 || !Number(value)) {
+    value = 0;
+  } else {
     value = Number(value);
   }
-  setInputData((prevData:any) =>
-      prevData?.map((row:any, index: number) => {
-        if (index === rowIndex) {
-          return {
-            ...row,
-            [field ]: value,
-          };
-        }
-        return row;
-      })
-    );
+  setInputData((prevData: any) =>
+    prevData?.map((row: any, index: number) => {
+      if (index === rowIndex) {
+        return {
+          ...row,
+          [field]: value,
+        };
+      }
+      return row;
+    })
+  );
 };
 ;
 
+export const InputTableBody = (
+  chgRes: any[] | [],
+  headList: TableUpperProps[],
+  setInputData: (data: any[]) => void
+) => {
+  // mergeCell 처리용
+  const getRowSpan = (data: any[], key: string, rowIndex: number) => {
+    if (rowIndex > 0 && data[rowIndex][key] === data[rowIndex - 1][key]) {
+      return 0; // 이전과 같으면 셀을 그리지 않음
+    }
+    let span = 1;
+    for (let i = rowIndex + 1; i < data.length; i++) {
+      if (data[i][key] === data[rowIndex][key]) span++;
+      else break;
+    }
+    return span;
+  };
 
-
-export const InputTableBody = (chgRes: any[] | [] ,headList:TableUpperProps[], setInputData: (data: any[]) => void) => {
-  return (
+ return (
     <>
-      {chgRes.map((data, dataIndex) => (
-        <TableRow key={dataIndex + "row"}>
-          {headList.map((head, headIndex) => (
-            <TableCell key={head.id + headIndex} className="w-36" >
-              {head.edit ===true && data.edit !==false?
-              <Input
-                className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-xl h-10 w-full`}
-                onChange={(e) =>
-                  handleChange(dataIndex, head.id, e.target.value,setInputData)
-                }
-                value={data[head.id as keyof any] ?? ""}
-              /> : (
-                <div
-                  className={`
-                    ${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} 
-                    !text-xl w-full h-10 
-                  `}
+      {chgRes.map((data, dataIndex) => {
+        // 소계/총합계 행 판별
+        const isSubTotal = data["용수명"] === "소계";
+        const isTotal = data["구분"] === 0;
+        
+        const bgClass = isTotal
+          ? "bg-[#d5e1eb] font-bold"
+          : isSubTotal
+          ? "bg-[#e6eef5] font-semibold"
+          : "";
+
+        return (
+          <TableRow key={dataIndex + "row"}>
+            {headList.map((head, headIndex) => {
+            // 총합계 행이면 "구분"에서 colSpan=2로 병합
+            if (
+              data["구분"] === 0 &&
+              head.id === "구분"
+            ) {
+              return (
+                <TableCell
+                  key={head.id + headIndex}
+                  colSpan={2}
+                  className="font-bold text-center bg-[#d5e1eb]"
                 >
-                  {data[head.id as keyof any] ?? ""}
-                </div>
-              )
+                  총합계
+                </TableCell>
+              );
+            }
+            // 총합계(합계) 행이면 "용수명" 컬럼은 렌더링하지 않음
+            if (
+              data["구분"] === 0 &&
+              head.id === "용수명"
+            ) {
+              return null;
+            }
+              // mergeCell 처리
+              if (head.mergeCell) {
+                const rowSpan = getRowSpan(chgRes, head.id, dataIndex);
+                if (rowSpan === 0) return null;
+                return (
+                  <TableCell key={head.id + headIndex} rowSpan={rowSpan} className={`w-36 align-middle text-center whitespace-nowrap ${bgClass}`}>
+                    {data[head.id as keyof any] ?? ""}
+                  </TableCell>
+                );
               }
-            </TableCell>
-          ))}
-        </TableRow>
-      ))}
+              // 기본 셀
+              return head.edit === true && data.edit !== false ? (
+                <TableCell key={head.id + headIndex} className={`w-36 ${bgClass}`}>
+                  <Input
+                    className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-xl h-10 w-full`}
+                    onChange={(e) =>
+                      handleChange(dataIndex, head.id, e.target.value, setInputData)
+                    }
+                    value={data[head.id as keyof any] ?? ""}
+                  />
+                </TableCell>
+              ) : (
+                <TableCell key={head.id + headIndex} className={`w-36 ${bgClass}`}>
+                  <div
+                    className={`
+                      ${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} 
+                      !text-xl w-full h-10 
+                    `}
+                  >
+                    {data[head.id as keyof any] ?? ""}
+                  </div>
+                </TableCell>
+              );
+            })}
+          </TableRow>
+        );
+      })}
     </>
   );
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
index 28dc882c3..fb6ba9b22 100644
--- a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
@@ -52,6 +52,7 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
 
   useEffect(() => {
     if (files) {
+      console.log("이런")
       const file = files[0];
       if (form.getValues("ym").length < 1) {
         ToastFormUi({
@@ -62,11 +63,12 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
         return;
       }
 
-      if (file)
+      if (file) {
         filePicked(file, 0).then((res) => {
           if (res !== undefined)
-          setExcelData(excelToPbnPrfData(res as unknown as JSON[], form.getValues("ym"),form.getValues('pbnstRuseFcltFk') ) as PrfType[])
+            setExcelData(excelToPbnPrfData(res as unknown as JSON[], form.getValues("ym"), form.getValues('pbnstRuseFcltFk')) as PrfType[])
         });
+      }
     }
   }, [files]);
 
@@ -75,82 +77,85 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
       <div>
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)}>
-            <div>
+            <div className="flex justify-between items-center">
               <Title title={"하수재이용 실적등록"}></Title>
-            </div>
-            <div className="flex justify-between">
-              <h3 className="text-2xl font-bold text-gray-900 mt-1 ml-7">
-                {"점검정보 입력"}
-              </h3>
-
-              <Button className="" type="submit">
+              <Button className="mr-6 mt-10" type="submit">
                 저장
               </Button>
             </div>
+            <h3 className="text-2xl font-bold text-gray-900 my-3 ml-7">
+              {"점검정보 입력"}
+            </h3>
 
-            <div>
+            <div className="mx-7">
               <FormField
                 control={form.control}
                 name="ym"
                 render={({ field }) => (
                   <FormUi label="등록년도">
                     <SelectBox
-                      className="w-1/4 text-3xl"
+                      className="w-1/2 pr-4 text-3xl"
                       selectClass={""}
                       label=""
                       selectArray={yearOptions}
-                      value={field.value||new Date().getFullYear()}
+                      value={field.value || new Date().getFullYear()}
                       onSelectValue={(val) => field.onChange(val)}
                     />
                   </FormUi>
                 )}
               />
-
-              <FormField
-                control={form.control}
-                name="bscFctNm"
-                render={({ field }) => (
-                  <FormUi label="시설명">
-                    <Input
-                      className="w-1/4 text-3xl"
-                      value={field.value||''}
-                      onChange={field.onChange}
-                      readOnly
-                    />
-                  </FormUi>
-                )}
-              />
-              <FormField
-                control={form.control}
-                name="pbnstRuseFcltNm"
-                render={({ field }) => (
-                  <FormUi label="재이용시설명">
-                    <Input
-                      className="w-1/4 text-3xl"
-                      value={field.value||''}
-                      onChange={field.onChange}
-                      readOnly
-                    />
-                  </FormUi>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name="file"
-                render={({ field }) => (
-                  <FormUi label="점검결과 파일">
-                    <FileUpload
-                      files={files || []}
-                      setFiles={(files: File[] | null) => {
-                        if (files) setFiles(files);
-                      }}
-                      fileTypes="xlsx"
-                      maxFiles={1}
-                    ></FileUpload>
-                  </FormUi>
-                )}
-              />
+              <div className="flex gap-4 mt-4">
+                <div className="flex-1">
+                  <FormField
+                    control={form.control}
+                    name="bscFctNm"
+                    render={({ field }) => (
+                      <FormUi label="시설명">
+                        <Input
+                          className="text-3xl"
+                          value={field.value || ''}
+                          onChange={field.onChange}
+                          readOnly
+                        />
+                      </FormUi>
+                    )}
+                  />
+                </div>
+                <div className="flex-1">
+                  <FormField
+                    control={form.control}
+                    name="pbnstRuseFcltNm"
+                    render={({ field }) => (
+                      <FormUi label="재이용시설명">
+                        <Input
+                          className="flex-1 text-3xl"
+                          value={field.value || ''}
+                          onChange={field.onChange}
+                          readOnly
+                        />
+                      </FormUi>
+                    )}
+                  />
+                </div>
+              </div>
+              <div className="mt-4">
+                <FormField
+                  control={form.control}
+                  name="file"
+                  render={({ field }) => (
+                    <FormUi label="점검결과 파일">
+                      <FileUpload
+                        files={files || []}
+                        setFiles={(files: File[] | null) => {
+                          if (files) setFiles(files);
+                        }}
+                        fileTypes="xlsx"
+                        maxFiles={1}
+                      ></FileUpload>
+                    </FormUi>
+                  )}
+                />
+              </div>
             </div>
           </form>
         </Form>
diff --git a/apps/wr/public/sample_pbnstPrfmncReg.xlsx b/apps/wr/public/sample_pbnstPrfmncReg.xlsx
index 67f0d559e096443366eeff0f951b5648e422a972..1f2ff81aa24e1dce6ca8e8bce7fd7d9f54ed91ad 100644
GIT binary patch
delta 5703
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
Zg@FIlFR(-*Qlvky5+P>vNWTBX{udqJuh;+p

delta 5698
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
bxhN<AfZ1QxC;ET8<`KO@Oqh;*{|5gB5!#Gk


From 9b07952340e11f275d7aa12321c74b09bcb7613a Mon Sep 17 00:00:00 2001
From: yschoi <yschoi>
Date: Tue, 1 Jul 2025 19:09:45 +0900
Subject: [PATCH 04/44] =?UTF-8?q?=ED=95=98=EC=88=98=EA=B4=80=EB=A1=9C=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9D=EC=8B=9C=20=EC=84=A4=EC=A0=95=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/middleware.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/wr/middleware.ts b/apps/wr/middleware.ts
index 3fabc529d..5acc41863 100644
--- a/apps/wr/middleware.ts
+++ b/apps/wr/middleware.ts
@@ -6,6 +6,7 @@ const CLAIM_NAME = "Authorization";
 const AUTH_USER_ID = "token-id";
 const serverApiUrl = CS_URL;
 const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || "";
+const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || "";
 
 export function middleware(req: NextRequest) {
   const pathname = req.nextUrl.pathname;
@@ -55,9 +56,17 @@ export function middleware(req: NextRequest) {
     return NextResponse.rewrite(new URL(newUrl));
   }
 
+  if (pathname.startsWith("/sewerage-service")) {
+    const queryParams = searchParams.toString();
+    const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${queryParams ? `?${queryParams}` : ""
+      }`;
+    console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
+    return NextResponse.rewrite(new URL(newUrl));
+  }
+
   return NextResponse.next();
 }
 
 export const config = {
-  matcher: ["/server/:path*", "/attach-service/:path*", "/geoserver/:path*"],
+  matcher: ["/server/:path*", "/attach-service/:path*", "/geoserver/:path*", "/sewerage-service/:path*"],
 };

From 9cf281db7e9c139a21a9383caa99f31621e99c1e Mon Sep 17 00:00:00 2001
From: yschoi <yschoi>
Date: Tue, 1 Jul 2025 19:32:25 +0900
Subject: [PATCH 05/44] =?UTF-8?q?gis=20=EC=9B=90=EB=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business_components/src/ui/map/Gis.js     | 67 ++++---------------
 .../src/ui/map/lib/gis.core.js                | 21 +++---
 .../src/ui/map/lib/gis.layer.js               | 10 ++-
 3 files changed, 31 insertions(+), 67 deletions(-)

diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index 8929a3124..6d46e77aa 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -1,6 +1,5 @@
 import { Search } from 'lucide-react';
 import OlMap from 'ol/Map';
-import Overlay from 'ol/Overlay';
 import View from 'ol/View';
 import { defaults as defaultControls, OverviewMap } from 'ol/control';
 import { defaults } from 'ol/interaction';
@@ -19,22 +18,7 @@ import GisApp from './lib/gis.core';
 export const GisContext = createContext({ gisCore: null, gisMap: null, treeData: null, checkedLayerIds: null });
 export const useGisContext = () => useContext(GisContext);
 
-function Gis({
-	isOpen,
-	gisMaps,
-	isSearchModalOpen,
-	treeData = [],
-	isSearch = false,
-	isMiniMap = false,
-	setIsOpen,
-	setFeatureData,
-	featureData,
-	searchView: SearchView,
-	detailView: DetailView,
-	onFeatureSelect,
-	setIsSearchModalOpen,
-	onCheckedLayersChange
-}) {
+function Gis({ isOpen, gisMaps, isSearchModalOpen, treeData = [], isSearch = false, isMiniMap = false, setIsOpen, setFeatureData, featureData, searchView: SearchView, detailView: DetailView, onFeatureSelect, setIsSearchModalOpen }) {
 	const mapRef = useRef();
 	const [mapObject, setMapObject] = useState({});
 	const [tabVisible, setTabVisible] = useState(true);
@@ -44,17 +28,13 @@ function Gis({
 	const gisCore = useMemo(() => new GisApp.core({ targetId: mapRef.current }), []);
 	const mapInstanceRef = useRef(null);
 	const checkedLayerIds = useRef([]);
-	// 체크된 레이어 상태 관리
-	const [checkedLayers, setCheckedLayers] = useState([]);
-	const [checkedLayersData, setCheckedLayersData] = useState([]);
-
 	let gisMap = null;
 	const closePopup = () => {
 		setIsOpen(false); // 팝업 닫기
 		setFeatureData(null)
 	};
 
-	// Feature Click Event
+	// SearchModal, GisContent 등에서 호출
 	const handleFeatureSelect = useCallback((data) => {
 		gisMap = mapInstanceRef.current;
 
@@ -109,10 +89,8 @@ function Gis({
 		setFeatureData(data);
 		setIsOpen(true);
 		setIsSearchModalOpen(false);
-		onFeatureSelect?.(data); // 선택된 피쳐 데이터 콜백 호출
 	}, [mapInstanceRef]);
 
-	// 지도 생성 및 초기화
 	useEffect(() => {
 		if (!mapRef.current) return;
 		if (mapInstanceRef.current) return; // 이미 생성된 맵이 있다면 중단
@@ -126,7 +104,7 @@ function Gis({
 		]);
 		register(proj4);
 
-		// OpenLayers 지도 객체 생성
+		//맵 생성
 		const map = new OlMap({
 			layers: [gisCore.baseLayers['base'], gisCore.baseLayers['satellite']],
 			renderer: 'webgl',
@@ -154,7 +132,7 @@ function Gis({
 
 		gisMaps.current = map
 
-		// 미니맵 추가
+		//미니맵
 		if (isMiniMap) {
 			const overviewMap = new OverviewMap({
 				layers: [GisApp.Module.core.baseMiniMapLayers['base']],
@@ -169,7 +147,6 @@ function Gis({
 			map.addControl(overviewMap);
 		}
 
-		// 스케일 컨트롤 및 베이스 레이어 설정
 		gisCore.__proto__.map = map;
 		gisCore.scaleControl();
 		gisCore.changeBaseLayer('base');
@@ -177,20 +154,16 @@ function Gis({
 		mapInstanceRef.current = map; // 생성 완료 플래그 설정
 	}, []);
 
-	// treeData 변경 시 레이어 코드 생성
 	useEffect(() => {
 		if (!treeData || treeData.length === 0) return;
 
-		// 기존 오버레이 및 레이어 모두 삭제
 		gisCore.deleteAllOverlay();
 		gisCore.deleteAllLayer();
 
-		// 트리 데이터를 레이어 코드 객체로 변환
 		const layerCode = gisCore.convertLayerInfosToLayerCode(treeData, 'lyrSn');
-		GisApp.layerCode = layerCode; // 전역 레이어 코드 설정
+		GisApp.layerCode = layerCode;
 
 		//setTreeData(data);
-		// 편집 가능한 레이어 목록 생성
 		const layerItems = getLayerItems(layerCode);
 		//setEditLayerItems(prev => [...layerItems])
 	}, [treeData]);
@@ -220,45 +193,31 @@ function Gis({
 		}
 	}
 
-	// 체크된 레이어 정보를 처리하는 함수
-	const handleCheckedLayersChange = useCallback((checkedIds, checkedNodesData) => {
-		setCheckedLayers(checkedIds);
-		setCheckedLayersData(checkedNodesData);
-		onCheckedLayersChange?.(checkedIds, checkedNodesData);
-	}, [onCheckedLayersChange]);
-
 	return (
 		<>
 			<GisContext.Provider value={{ gisCore, gisMap: mapInstanceRef.current, treeData, checkedLayerIds }}>
 				<div className="h-[calc(100vh-10rem)] flex relative">
 					<div ref={mapRef} className="gis-map flex-1 relative" style={{ height: '100%', padding: 0 }} />
-					<GisTree
-						visible={tabVisible}
-						setVisible={setTabVisible}
-						onCheckedChange={handleCheckedLayersChange}
-					/>
+					<GisTree visible={tabVisible} setVisible={setTabVisible} />
 
 					{/* <GisContent onFeatureSelect={handleFeatureSelect} isSearch={isSearch} isSearchModalOpen={isSearchModalOpen} setIsSearchModalOpen={setIsSearchModalOpen} /> */}
 
-					{/* DetailView가 존재할 때만 렌더링 isSearchModalOpen이 true면 visible=false로 팝업 숨김 */}
+					{/* isSearchModalOpen이 true면 visible=false로 팝업 숨김 */}
 					{isOpen && featureData && !isSearchModalOpen && (
 						<DetailView
 							featureData={featureData}
 							onClose={closePopup} // 닫기 콜백 전달
 						/>
 					)}
-					{/* SearchView가 존재할 때만 렌더링 */}
-                {SearchView && (
-                    <SearchView
-                        open={isSearchModalOpen}
-                        onOpenChange={setIsSearchModalOpen}
-                        onFeatureSelect={handleFeatureSelect}
-                    />
-                )}
+					<SearchView
+						open={isSearchModalOpen}
+						onOpenChange={setIsSearchModalOpen}
+						onFeatureSelect={onFeatureSelect}
+					/>
 					<GisLonLat />
 					<GisToolBar />
 					<GisMapToggle />
-					<GisSelect onFeatureSelect={handleFeatureSelect} />
+					<GisSelect onFeatureSelect={onFeatureSelect} />
 				</div>
 
 				{isSearch && (
diff --git a/packages/common/business_components/src/ui/map/lib/gis.core.js b/packages/common/business_components/src/ui/map/lib/gis.core.js
index 7488e4b72..ddfcec3a1 100644
--- a/packages/common/business_components/src/ui/map/lib/gis.core.js
+++ b/packages/common/business_components/src/ui/map/lib/gis.core.js
@@ -1,24 +1,26 @@
 import MousePosition from 'ol/control/MousePosition';
 import ScaleLine from 'ol/control/ScaleLine';
-import { getTopLeft } from 'ol/extent';
 import Feature from 'ol/Feature';
-import GeoSJON from 'ol/format/GeoJSON';
 import WKT from 'ol/format/WKT';
-import { Point } from 'ol/geom';
 import LinearRing from 'ol/geom/LinearRing';
 import Draw from 'ol/interaction/Draw';
 import TileLayer from 'ol/layer/Tile';
-import VectorLayer from 'ol/layer/Vector';
 import * as olProj from 'ol/proj';
 import VectorSource from 'ol/source/Vector';
-import TileWMTS from 'ol/source/WMTS';
 import XYZ from 'ol/source/XYZ';
+import GeoSJON from 'ol/format/GeoJSON';
 import { Fill, Stroke, Style } from 'ol/style';
 import CircleStyle from 'ol/style/Circle';
+import VectorLayer from 'ol/layer/Vector';
+import { Point } from 'ol/geom';
+import { getTopLeft } from 'ol/extent';
+import TileWMTS from 'ol/source/WMTS';
 import WMTSTileGrid from 'ol/tilegrid/WMTS';
 // import { get as getProjection } from 'ol/proj';
-import { register } from 'ol/proj/proj4';
 import proj4 from 'proj4';
+import { register } from 'ol/proj/proj4';
+import olSourceImageWMS from 'ol/source/ImageWMS';
+import { GeoJSON } from 'ol/format';
 import GisOlEditLayer from './gis.edit';
 import GisOlLayer from './gis.layer';
 
@@ -560,7 +562,6 @@ GisApp.core.prototype = {
 	 *
 	 * Returns:
 	 */
-	// 레이어를 지도에 표시/숨김
 	setLayerOnMap: function (layerIds, visible, addQurryFlter) {
 		for (let i in layerIds) {
 			let id = layerIds[i];
@@ -571,14 +572,10 @@ GisApp.core.prototype = {
 				const layerCode = GisApp.layerCode[id];
 				const queryFlter = layerCode?.flterSql || '' + ' ' + (addQurryFlter || '');
 				layerCode['flterSql'] = queryFlter;
-				//layer = this.addWmsLayer(layerCode);
-
-				// WFS 레이어 생성 및 지도에 추가
+				//layer = this.addWmsLayer(layerCode);				
 				layer = this.addWfsLayer(layerCode);
 			}
 		}
-
-		// 선택 인터랙션 및 스냅 기능 설정
 		if (GisApp.Module.select) {
 			this.setSelectInteraction();
 		}
diff --git a/packages/common/business_components/src/ui/map/lib/gis.layer.js b/packages/common/business_components/src/ui/map/lib/gis.layer.js
index d9657c313..097c90ba5 100644
--- a/packages/common/business_components/src/ui/map/lib/gis.layer.js
+++ b/packages/common/business_components/src/ui/map/lib/gis.layer.js
@@ -77,7 +77,15 @@ GisOlLayer.prototype = {
 		let lyrTyNm = options.lyrTyNm;
 		let typename = this.storageNm + lyrTyNm;
 		
-		if(options.lyrTyNm == "om_dt_untrt_swg_rain"){ //중점우수토실실
+		if(options.lyrTyNm == "om_dt_untrt_swg_rain" //중점우수토실
+			|| options.lyrTyNm == "om_wqlt_station"  //관측소
+			|| options.lyrTyNm == "tb_wr_bdst_ruse_fclt"  //재이용시설
+			|| options.lyrTyNm == "tb_wr_rnwtr_utztn_fclt"  //빗물이용시설
+			|| options.lyrTyNm == "tb_wr_rswtr_fclt"  //중수도시설
+			|| options.lyrTyNm == "tb_wr_htdfl_fclt"  //온배수시설
+			|| options.lyrTyNm == "tb_wr_tmpr_dmd_co"  //잠재수요처
+		) 
+		{ 
 			url = GisApp.SN_GEOSERVER_URL;
 			typename = lyrTyNm;
 		}

From 54140dbad5cbf7bc4cf9afc36ccc3d41fecee79e Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 1 Jul 2025 20:11:29 +0900
Subject: [PATCH 06/44] =?UTF-8?q?=EC=9A=B0=EB=A6=AC=EB=8F=99=EB=84=A4?=
 =?UTF-8?q?=EA=B0=80=EB=AD=84=20=EC=8B=9C=EB=8F=84,=20=EC=8B=9C=EA=B5=B0?=
 =?UTF-8?q?=EA=B5=AC=20=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=97=90=20=EC=8B=9C?=
 =?UTF-8?q?=EB=8F=84,=20=EC=8B=9C=EA=B5=B0=EA=B5=AC=20=ED=91=9C=EC=B6=9C?=
 =?UTF-8?q?=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMng/drgtSttn/page.tsx    | 58 ++++++++++---------
 .../wr/app/store/matDmd/drgtSttn/headList.tsx |  4 +-
 apps/wr/app/store/matDmd/drgtSttn/index.tsx   | 36 +++++-------
 .../ui/modal/coMat/drgtDetailModal.tsx        |  3 +-
 4 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
index 2f07dd6de..af49f02b1 100644
--- a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
@@ -3,14 +3,13 @@ import { useWrStore } from "@/app/store";
 import { btnClass } from "@/app/store/common/code";
 import type { customDrgt } from "@/app/store/matDmd/drgtSttn";
 import { drgtHeadListExport } from "@/app/store/matDmd/drgtSttn/headList";
-import { excelDownload, getCity } from "@/components/lib/func/commom";
+import { getCity } from "@/components/lib/func/commom";
 import DrgtDetailModal from "@/components/ui/modal/coMat/drgtDetailModal";
 import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 import { ContentsDiv, DateMonthPicker, downloadExcel, SearchDiv, SearchFormLeft, SearchFormRight, SelectBox, Title, UiModal, UiTable, type SelectDataType } from "@common/business_components/ui";
-import { MonthPicker } from "@common/business_components/ui/date_month_picker/mothPicker";
 import ListDiv from "@common/business_components/ui/list_div";
-import { Button, DatePicker, Label, ScrollArea } from "@common/components/ui";
-import { useCallback, useEffect, useState } from "react";
+import { Button, Label, ScrollArea } from "@common/components/ui";
+import { useEffect, useState } from "react";
 import { toast, Toaster } from "react-hot-toast";
 
 export default function DrgtSttn() {
@@ -23,7 +22,6 @@ export default function DrgtSttn() {
     const [tableData, setTableData] = useState<customDrgt[]>();
     const [selectedSgg, setSelectedSgg] = useState<string>('');
     const [excelData, setExcelData] = useState<any[]>();
-    const [num, setNum] = useState<string>();
     const [drgtModal, setDrgtModal] = useState<{
         isOpen: boolean;
         data: customDrgt | undefined;
@@ -53,7 +51,23 @@ export default function DrgtSttn() {
     }, [drgt.isInit, drgtInit]);
 
     useEffect(() => {
-        const resData = Array.isArray(drgtRes) ? drgtRes : [drgtRes];
+        let resData = Array.isArray(drgtRes) ? drgtRes : [drgtRes];
+        resData = resData.map((item) => {
+            console.log("item", item);
+            if(item.sggNm === '세종시'){
+                return {
+                    ...item,
+                    ctpvCd: '세종특별자치시',
+                    sggNm: ''
+                }
+            }
+
+            return {
+                ...item,
+                ctpvCd: code.cityCd.find(ct => (ct.text == item.sggNm || (code.sggCd.find(sgg => sgg.text == item.sggNm)?.val.substring(0,2) == ct.val)))?.text,
+                sggNm: code.sggCd.find(sgg => sgg.text == item.sggNm)?.text
+            }
+        })
         const data = Array.isArray(resData)
             ? resData.map((item: customDrgt) => {
                 return {
@@ -67,7 +81,7 @@ export default function DrgtSttn() {
                 }
             }) : [];
         setExcelData(data)
-        setTableData(drgtRes)
+        setTableData(resData)
     }, [drgtRes])
 
     useEffect(() => {
@@ -76,27 +90,14 @@ export default function DrgtSttn() {
         }
     }, [drgtMoRes]);
 
-    const getCityVal = (val: string, sggCd: SelectDataType[]) => {
-        const data = sggCd
-            .filter((item) => String(item.val).substring(0, 2) === val)
-            .map((item) => ({
-                val: item.val,
-                text: item.text, // 한국어 텍스트
-            }));
-        return data;
-    };
-
     const getSelCity = (val: string | number) => {
-        const cityValue = String(val);
-        const data = getCityVal(cityValue, code.sggCd);
+        const cityValue = String(val); // Ensure val is treated as a string
+        const data = getCity(cityValue, code.sggCd);
         setSelectSgg(data);
-
-        const sggVal = data.length > 0 ? data[0].val : '';
-        setSelectedSgg(sggVal); // 시군구 value 세팅
-        setObjSearch({ city: cityValue, sgg: sggVal });
+        setObjSearch({ city: cityValue, sgg: "" });
     };
+
     const getSgg = (val: string | number) => {
-        setSelectedSgg(String(val));
         setObjSearch({ ...objSearch, sgg: String(val) });
     };
 
@@ -181,19 +182,22 @@ export default function DrgtSttn() {
                                         size={"sm"}
                                         onClick={(e) => {
                                             let sidoText = '';
-                                            let sggText = '';
+                                            let sggText = [];
 
                                             if (objSearch?.city.toString().length > 0) {
                                                 sidoText = code.cityCd.find((item) => item.val === objSearch?.city)?.text ?? '';
                                             }
                                             if (objSearch?.sgg.toString().length > 1) {
                                                 sggText = code.sggCd.find((item) => item.val === objSearch?.sgg)?.text ?? '';
+                                            } else {
+                                                sggText = code.sggCd.filter((item) => item.val.substring(0, 2) === objSearch?.city).map((item) => item.text);
+                                                
                                             }
                                             if (sidoText === '세종특별자치시') {
                                                 sidoText = '세종시';
                                                 sggText = sidoText;
                                             }
-                                            drgtSearch(fromDate ?? "", toDate ?? "", sidoText, sggText)
+                                            drgtSearch(fromDate ?? "", toDate ?? "", [sidoText, ...sggText])
                                         }}
                                     >
                                         조회
@@ -249,7 +253,7 @@ export default function DrgtSttn() {
                         setDrgtModal({ ...drgtModal, isOpen: !drgtModal.isOpen });
                     }}
                     bodyClass={"w-[50vw] max-w-none h-[80vh]"}
-                    body={<DrgtDetailModal data={drgtModal.data} /*formObj={drgtModal.data}*/ />}
+                    body={<DrgtDetailModal data={drgtModal.data}/>}
                 />
                 <Toaster position="top-center" />
             </ContentsDiv>
diff --git a/apps/wr/app/store/matDmd/drgtSttn/headList.tsx b/apps/wr/app/store/matDmd/drgtSttn/headList.tsx
index 1741b7456..dcdc655b5 100644
--- a/apps/wr/app/store/matDmd/drgtSttn/headList.tsx
+++ b/apps/wr/app/store/matDmd/drgtSttn/headList.tsx
@@ -2,8 +2,8 @@ import { z } from "zod";
 import type { CommonTableProps } from "../../common/type/header";
 
 export const drgtZod = z.object({
-  ctpvCd: z.string().default(''),
-  sggNm: z.string().default(''),
+  ctpvCd: z.string().default('').nullish(),
+  sggNm: z.string().default('').nullish(),
   normal: z.string().default(''),
   attention: z.string().default(''),
   caution: z.string().default(''),
diff --git a/apps/wr/app/store/matDmd/drgtSttn/index.tsx b/apps/wr/app/store/matDmd/drgtSttn/index.tsx
index 053bb12fc..4211d2d08 100644
--- a/apps/wr/app/store/matDmd/drgtSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/drgtSttn/index.tsx
@@ -1,4 +1,4 @@
-import { fetchType, getFetch } from "@/components/lib/api";
+import { fetchType, getFetch, postFectch } from "@/components/lib/api";
 import type { CommonTableProps } from "../../common/type/header";
 import { drgtHeadListExport, drgtZod } from "./headList";
 import type { z } from "zod";
@@ -20,7 +20,7 @@ export type drgtState = {
 
 type drgtActions = {
   drgtInit: () => void
-  drgtSearch: (fromDate: string, toDate: string, sido: string, sgg: string) => void
+  drgtSearch: (fromDate: string, toDate: string, sido: string[]) => void
   drgtModalSearch: (fromDate: string, toDate: string, sgg: string) => void
 };
 
@@ -35,27 +35,20 @@ export const drgtStateExport: drgtState = {
   }
 }
 
-const initFetch = async (fromDate: string, toDate: string, sido: string, sgg: string) => {
-
-  let searchUrl = "";
-
-  if (sido === "" || sido === "전체") {
-    searchUrl = `/il/getDataCount/${fromDate}/${toDate}`;
-  } else {
-    searchUrl = `/il/getDataCount/${fromDate}/${toDate}/${sido}/${sgg}`;
-  }
-
-  const drgtData = await getFetch(
-    fetchType.WR,
-    searchUrl
-  );
+const initFetch = async (fromDate: string, toDate: string, sido:string[]) => {
+console.log("sido",sido)
+  const drgtData = await postFectch(
+      `/il/getDataCount/${fromDate}/${toDate}`,
+      sido,
+      fetchType.WR
+    );
 
   //주의, 관심, 정상 추출
   const statusData = Array.from(
-    new Set(drgtData.map((e) => e.lvngMfgUswtrDrgtInfo))
+    new Set(drgtData.data.map((e) => e.lvngMfgUswtrDrgtInfo))
   );
 
-  const statusMap = drgtData.reduce((acc: any, { sggNm, lvngMfgUswtrDrgtInfo: status, countDrgt }: { sggNm: string; lvngMfgUswtrDrgtInfo: string; countDrgt: number }) => {
+  const statusMap = drgtData.data.reduce((acc: any, { sggNm, lvngMfgUswtrDrgtInfo: status, countDrgt }: { sggNm: string; lvngMfgUswtrDrgtInfo: string; countDrgt: number }) => {
     if (!acc[sggNm]) {
       acc[sggNm] = { sggNm, ...Object.fromEntries(statusData.map((e) => [e, 0])) };
     }
@@ -110,7 +103,7 @@ export const drgtActionsExport: (set: any) => drgtActions = (
         const toDate = formatted;
 
         //FIXME: 페이지 처음 로딩될때 데이터 보려고 6월로 박아놓음 이거 fromDate로 고치기
-        const drgtRes = await initFetch("202506", toDate, "", "");
+        const drgtRes = await initFetch("202506", toDate, []);
         set((state: drgtState) => {
           return {
             ...state,
@@ -125,10 +118,9 @@ export const drgtActionsExport: (set: any) => drgtActions = (
         console.log(e)
       }
     },
-    drgtSearch: async (fromDate: string, toDate: string, sido: string, sgg: string) => {
+    drgtSearch: async (fromDate: string, toDate: string, sido: string[]) => {
       try {
-
-        const drgtRes = await initFetch(fromDate, toDate, sido, sgg);
+        const drgtRes = await initFetch(fromDate, toDate, sido);
 
         set((state: drgtState) => {
           return {
diff --git a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
index 102292ccf..880c789c3 100644
--- a/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
+++ b/apps/wr/components/ui/modal/coMat/drgtDetailModal.tsx
@@ -3,11 +3,10 @@
 import { btnClass } from "@/app/store/common/code"
 import type { customDrgt } from "@/app/store/matDmd/drgtSttn"
 import { drgtDetailHeadListExport } from "@/app/store/matDmd/drgtSttn/headList"
-import { excelDownload } from "@/components/lib/func/commom"
 import { downloadExcel, Title, UiTable } from "@common/business_components/ui"
 import ListDiv from "@common/business_components/ui/list_div"
 import { Button, ScrollArea } from "@common/components/ui"
-import { useCallback, useEffect, useState } from "react"
+import { useEffect, useState } from "react"
 
 export default function DrgtDetailModal({
     data,

From 08adf380e678d3b2ec16a83a958a966d3ba93abf Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 1 Jul 2025 20:17:38 +0900
Subject: [PATCH 07/44] =?UTF-8?q?=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMng/drgtSttn/page.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
index af49f02b1..317e05dc6 100644
--- a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
@@ -202,13 +202,6 @@ export default function DrgtSttn() {
                                     >
                                         조회
                                     </Button>
-                                    <Button
-                                        size={"sm"}
-                                        className={btnClass}
-                                        onClick={() => { }}
-                                    >
-                                        상세보기
-                                    </Button>
                                     <Button
                                         size={"sm"}
                                         className={`${btnClass} green`}

From 7ea2521a93727e4d754bf872fe42ffe369d2c5ae Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Tue, 1 Jul 2025 20:27:20 +0900
Subject: [PATCH 08/44] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9=2031?=
 =?UTF-8?q?=EB=B2=88=EA=B9=8C=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

---
 apps/wr/app/matMng/coMng/coSttn/page.tsx      |  21 +-
 .../app/ruseFcltMng/fcltReg/rainReg/page.tsx  |   2 +-
 apps/wr/app/store/common/code/index.ts        |  29 +-
 .../ruseFcltMng/fcltReg/rainReg/index.tsx     |  36 +-
 .../ruseFcltMng/fcltReg/rainReg/type.tsx      |  15 +-
 apps/wr/components/lib/func/commom.tsx        |  27 +-
 .../ui/form/fcltReg/bdstReg/bdstReg.tsx       |  23 +-
 .../fcltReg/pbnstReg/buseReg/bugRegForm.tsx   |  73 ++--
 .../mngRegFormDetail/mngRegFormDetail.tsx     |   2 +-
 .../ui/form/fcltReg/rainReg/rainRegForm.tsx   | 396 ++++++++++++------
 .../fcltReg/bdstRegModal/bdstRegModal.tsx     |  16 +-
 .../components/ui/searchInput/searchInput.tsx |   3 -
 12 files changed, 418 insertions(+), 225 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/coSttn/page.tsx b/apps/wr/app/matMng/coMng/coSttn/page.tsx
index 163195756..181a5d82f 100644
--- a/apps/wr/app/matMng/coMng/coSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/coSttn/page.tsx
@@ -77,15 +77,18 @@ export default function CoSttn() {
   }, [coSttn.isInit, coSttnInit]);
 
   useEffect(() => {
-    if (coSttnRes?.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(coSttnRes, { code });
-      const chData = data.map((item: any) => ({
-        ...item,
-      }));
-      // .filter((item: any) => item !== undefined);
-      setBdstTable(chData);
-    } else if (coSttnRes.length == 0) {
-      setBdstTable([]);
+    if(coSttnRes){
+
+      if (coSttnRes?.length > 0 && code.cityCd.length > 0) {
+        const data = tableData(coSttnRes, { code });
+        const chData = data.map((item: any) => ({
+          ...item,
+        }));
+        // .filter((item: any) => item !== undefined);
+        setBdstTable(chData);
+      } else if (coSttnRes?.length == 0) {
+        setBdstTable([]);
+      }
     }
   }, [coSttnRes, code]);
 
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
index 2fa8b12b8..607b90886 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
@@ -158,7 +158,7 @@ export default function Home() {
           </div>
         </div>
         <UiModal
-          body={<BdstReg moType="RNB"></BdstReg>}
+          body={<BdstReg moType="RNB"  isModal={issNewReg} setIsModal={setIsNewReg} ></BdstReg>}
           bodyClass="w-[68vw] max-w-none h-[90vh]"
           open={issNewReg}
           onOpenChange={(open) => {
diff --git a/apps/wr/app/store/common/code/index.ts b/apps/wr/app/store/common/code/index.ts
index 83d87d738..17ea1f2e7 100644
--- a/apps/wr/app/store/common/code/index.ts
+++ b/apps/wr/app/store/common/code/index.ts
@@ -9,7 +9,26 @@ const yn: SelectDataType[] = [
   { val: 'Y', text: 'Y' },
   { val: 'N', text: 'N' },
 ]
+const bdstFilterYn: SelectDataType[] = [
+  { val: 'Y', text: 'Y' },
+  { val: 'N', text: 'N' },
+  { val: 'D', text: '확인불가' },
+  { val: 'F', text: '미가동' },
+]
+// 최우수(그린1)/우수(그린2), 우량(그린3), 일반(그린4),  확인불가 체크
+const bdstGrntchClass: SelectDataType[] = [
+  { val: '최우수(그린1)', text: '최우수(그린1)' },
+  { val: '우수(그린2)', text: '우수(그린2)' },
+  { val: '우량(그린3)', text: '우량(그린3)' },
+  { val: '일반(그린4)', text: '일반(그린4)' },
+  { val: '확인불가', text: '확인불가' },
 
+]
+const bdstIncenYn: SelectDataType[] = [
+  { val: 'Y', text: 'Y' },
+  { val: 'N', text: 'N' },
+  { val: 'D', text: '확인불가' },
+]
 //처리장연계/자체+연계/자체처리
 const erctUswtrPrcsMeth : SelectDataType[]= [
   { val: '처리장연계', text: '처리장연계' },
@@ -204,6 +223,9 @@ export type comCodeState = {
     ruseBizMthdCd: SelectDataType[];
     rusePrcsMthdCd: SelectDataType[];
     erctUswtrPrcsMeth: SelectDataType[];
+    bdstFilterYn: SelectDataType[];
+    bdstIncenYn: SelectDataType[];
+    bdstGrntchClass:SelectDataType[];
   };
 };
 
@@ -217,7 +239,7 @@ export const getSggCd = async (set: any) => {
   })); */
 
   const sggCd  = [
-    { text: "전체", val: '0' },
+  //  { text: "전체", val: '0' },
     ...sgg
       .map((item: any) => ({
         text: item.gugun || '',
@@ -356,7 +378,10 @@ export const comCodeStateExport: comCodeState = {
     ruseSeCd:ruseSeCd,
     ruseBizMthdCd: ruseBizMthdCd,
     rusePrcsMthdCd:rusePrcsMthdCd,
-    erctUswtrPrcsMeth:erctUswtrPrcsMeth
+    erctUswtrPrcsMeth:erctUswtrPrcsMeth,
+    bdstFilterYn:bdstFilterYn,
+    bdstIncenYn:bdstIncenYn,
+    bdstGrntchClass:bdstGrntchClass
   },
 };
 
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
index 372a4bd9a..9a6c73e4e 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
@@ -10,7 +10,7 @@ export const TEST_UUID= '2d4b151d-1828-41e0-91d9-4cd28ea1cc7e'
 const rainyObjSchema = z.object({
   bdstReuseFcltFk: z.number().nullish(),
   pntfColKnd: z.string().min(1, { message: validationMessages.requiredSelect("종류") }),
-  pntfColArea: z.number().positive({ message: validationMessages.required("면적(m³)") }),
+  pntfColArea: z.number().nullish() ,
   dtfcltCpct: z.number().default(0),
   filtrTrtmfctYn: z.string().default("Y"),
   filtrTrtmfctCpct: z.number().nullish().default(0),
@@ -162,29 +162,27 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
 
         const test =await makeRstr(data);
         const res = await postFectch("/reuseFc/rainyInfo", test);
-        if(res.ok){
+        if(res.status===200){
           if(data.chgBuilding.length > 0){
-              await res.json().then((resData: any) => {
-              const chPK =  resData?.data?.bdstInfoPk
-              const makeCh=    resData.data.chgBuilding.map((item: chgBuilding) => 
+              
+              const chPK =  res?.data?.bdstInfoPk
+              const makeCh=    res.data.chgBuilding.map((item: chgBuilding) => 
                    (  {
                     ...item,
                     bdstInfoFk: chPK,
                   })
                 );    
-              const chch=   postFectch("/reuseFc/chgBuilding", makeCh);
-                return chch;
-            }).then((chch: any) => {
-
-              console.log('chch ', chch)
+              const chch=  await postFectch("/reuseFc/chgBuilding", makeCh);
                 if(chch.status ===200) {
-                   toast.success("등록이 완료되었습니다.");
-
+                   toast.success("건축물 등록이 완료되었습니다.");
+                }else{
+                  toast.error("건축물 증축/개축/중축 오류입니다.");
                 }
-            })
           }else{
-            toast.success("등록이 완료되었습니다.");
+            toast.success("건축물 등록이 완료되었습니다.");
           }
+        }else{
+          toast.error("건축물 등록이 완료되었습니다.");
         }
         const rainRes = await initFetch(code);
         set((state: rainFacState) => ({
@@ -197,7 +195,7 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
         }));
       } catch (e) {
         console.log("e", e);
-        alert("등록 오류입니다.");
+        toast.error("등록시 오류가 발생하였습니다.");
       } finally {
       }
     },
@@ -205,9 +203,9 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
       try {
         const chData =await makeMdfr(data);
         const res = await putFectch("/reuseFc/rainyInfo", chData);
-        console.log('rainUpdate', res);
-        if(res.ok){
-          alert(" 수정이 완료되었습니다.")
+        if(res.status === 200){
+          toast.success("수정이 완료되었습니다.");
+
         }
         const rainRes = await initFetch(code);
         set((state: rainFacState) => ({
@@ -220,7 +218,7 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
         }));
       } catch (e) {
         console.log("e", e);
-        alert("업데이트 오류입니다.");
+        toast.error("수정시 오류가 발생하였습니다.");
       } finally {
       }
     }
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
index 6e28c3e76..59d6633a2 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
@@ -17,19 +17,28 @@ export const baseReuseBuildingSchema = z.object({
   instlCstSprtYn: z.string().default("Y"),
   instlCstSprtAmt: z.number().nullish(),
   grntchBdstCertYn: z.string().default("Y"),
-  grntchBdstCertYr: z.string().default("").refine(
+  grntchBdstCertYr: z
+  .string()
+  .max(4, { message: validationMessages.yearFormat })
+  .refine(
     (year) => year.length === 0 || /^\d{4}$/.test(year),
     {
       message: validationMessages.yearFormat,
     }
-  ),
+  )
+  .nullish(),
   grntchBdstCertNo: z.string().default(""),
   grntchBdstCertGrd: z.string().default(""),
   crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
   crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
   crgRdctAmt: z.number().default(0), // 안쓰는 값
   ruseFcltFlg: z.string().default(""),
-  bdstUsgCd: z.number().min(1, { message: validationMessages.requiredSelect("건축물용도") }).default(0),
+  bdstUsgCd: z
+  .number()
+  .default(0)
+  .refine((val) => val === -1 || val >= 1, {
+    message: validationMessages.requiredSelect("건축물용도"),
+  }),
   lawTrgtYn: z.string().default("Y"),
   rgtr: z.string().nullish(),
   mdfr: z.string().nullish(),
diff --git a/apps/wr/components/lib/func/commom.tsx b/apps/wr/components/lib/func/commom.tsx
index e5dfc8c0c..8569d4eb3 100644
--- a/apps/wr/components/lib/func/commom.tsx
+++ b/apps/wr/components/lib/func/commom.tsx
@@ -9,12 +9,22 @@ import {
 import type { RefObject } from "react";
 
 export const getCity = (val: string, sggCd: SelectDataType[]) => {
-  const data = sggCd
-    .filter((item) => String(item.val).substring(0, 2) === val)
+
+  let data:any 
+  if(val !=='0'){
+    data = sggCd
+     .filter((item) => String(item.val).substring(0, 2) === val)
+     .map((item) => ({
+       val: item.val,
+       text: item.text, // 한국어 텍스트
+     }));
+  }else{
+    data = sggCd
     .map((item) => ({
       val: item.val,
       text: item.text, // 한국어 텍스트
     }));
+  }
   data.unshift({ val: "0", text: "전체" });
   return data;
 };
@@ -103,7 +113,18 @@ export const handleCommaNumberChange = (
 ) => {
   const raw = e.target.value.replace(/,/g, "");
   if (!/^\d*$/.test(raw)) return;
-  onChange(raw === "" ? "" : Number(raw));
+  onChange(raw === "" ? "" : Number(raw)); 
+};
+
+
+// onchange 텍스트를 숫자로 and ,제거
+export const handleMinusNumberChange = (
+  e: React.ChangeEvent<HTMLInputElement>,
+  onChange: (value: number | "") => void
+) => {
+  const raw = e.target.value.replace(/,/g, "");
+  if (!/^\d*$/.test(raw)) return;
+  onChange(raw === "" ? -1 : Number(raw)); 
 };
 
 // 숫자입력시 , 삽입
diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
index 0d00454e2..c1bf7e2ca 100644
--- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
+++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
@@ -16,8 +16,7 @@ import {
   type SelectDataType,
 } from "@common/business_components";
 import { Button, Checkbox, Input } from "@common/components";
-import { Check } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import { useEffect,  useState } from "react";
 import { useFieldArray } from "react-hook-form";
 
 export default function BdstReg({ form }: { form: any }) {
@@ -37,12 +36,6 @@ export default function BdstReg({ form }: { form: any }) {
       bdstUsgCd: "",
     });
   };
-// 잠깐 주석처리
-  // const removeLastItem = () => {
-  //   if (fields.length > 0) {
-  //     remove(fields.length - 1);
-  //   }
-  // };
   const removeSelected = () => {
   const idxsToRemove = fields
     .map((item, idx) => selectedIds.includes(item.id) ? idx : -1)
@@ -100,7 +93,7 @@ export default function BdstReg({ form }: { form: any }) {
   return (
     <>
       <h1 className={formH1Class}>
-        건축물 시설 정보
+        건축물 기본 정보
       </h1>
       <div className="grid grid-cols-6 gap-2 mt-4">
         <div className="col-span-3">
@@ -155,7 +148,7 @@ export default function BdstReg({ form }: { form: any }) {
               <FormUi label="건축물명">
                 <Input
                   className={selectClass}
-                  placeholder="1,000,000"
+                  placeholder="건축물 명 입력하세요"
                   type="text"
                   {...field}
                 />
@@ -168,10 +161,10 @@ export default function BdstReg({ form }: { form: any }) {
             control={form.control}
             name="daddr"
             render={({ field }) => (
-              <FormUi label="위치">
+              <FormUi label="건축물 주소">
                 <Input
                   className={selectClass}
-                  placeholder=""
+                  placeholder="위치를 입력해주세요"
                   type="search"
                   {...field}
                 />
@@ -225,7 +218,7 @@ export default function BdstReg({ form }: { form: any }) {
               <FormUi label="건축면적(m³)">
                 <Input
                   className={selectClass}
-                  placeholder="1,000,000"
+                  placeholder="면적을 입력하세요"
                   type="text"
                   onChange={(e) => {
                     handleCommaNumberChange(e, field.onChange);
@@ -324,8 +317,8 @@ export default function BdstReg({ form }: { form: any }) {
                 <Input
                   placeholder="-"
                   type="text"
-                  onChange={e => handleCommaNumberChange(e, f.onChange)}
-                  value={formatCommaNumber(f.value)}
+                  onChange={e => f.onChange}
+                  value={f.value}
                   className={selectClass}
                 />
               </FormUi>
diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
index 17983edf2..d2f9b79e6 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
@@ -30,7 +30,11 @@ import { Button, DataTable, Input, Label } from "@common/components";
 import { useEffect, useRef, useState } from "react";
 import { useFieldArray, useForm, type UseFormReturn } from "react-hook-form";
 import MngRegFormDetail from "../mngReg/mngRegFormDetail/mngRegFormDetail";
-import { safeDate } from "@/components/lib/func/commom";
+import {
+  formatCommaNumber,
+  handleCommaNumberChange,
+  safeDate,
+} from "@/components/lib/func/commom";
 import SearchInputText from "@/components/ui/searchInput/searchInput";
 import SdmInsertForm from "@common/business_components/ui/sdmInsertForm";
 import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
@@ -82,54 +86,57 @@ export function PbnstBuseForm({
   }>({ isMoal: false, data: {} as DemandCompType });
 
   useEffect(() => {
-  const etc=   isNaN(Number(form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`)))
+    const etc = isNaN(
+      Number(form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`))
+    );
     let total =
       (form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.gvsbs`) ?? 0) +
       (form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.lcep`) ?? 0) +
-      (form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.cusrAlotm`) ?? 0)
-      
-      if( !etc ) {
-        total+=Number(form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`))
-      }
+      (form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.cusrAlotm`) ?? 0);
+
+    if (!etc) {
+      total += Number(
+        form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`)
+      );
+    }
 
     form.setValue(`items.${indexMng}.fcBizs.${indexBiz}.totalMoney`, total);
   }, [
     form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.gvsbs`),
     form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.lcep`),
     form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.cusrAlotm`),
-    form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`)
+    form.getValues(`items.${indexMng}.fcBizs.${indexBiz}.etc`),
   ]);
 
+  const fcOrgwts = form.watch(`items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`);
 
-  const  fcOrgwts =  form.watch( `items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`)
-
-  useEffect(() =>{
-
-    console.log('fcOrgwts ', fcOrgwts)
-    if(fcOrgwts&&fcOrgwts?.length>0){
+  useEffect(() => {
+    console.log("fcOrgwts ", fcOrgwts);
+    if (fcOrgwts && fcOrgwts?.length > 0) {
       const swtrmtFcltFkList = fcOrgwts.map((item) => item.swtrmtFcltFk);
 
-      console.log('swtrmtFcltFkList ', swtrmtFcltFkList)
+      console.log("swtrmtFcltFkList ", swtrmtFcltFkList);
 
-      if(swtrmtFcltFkList.length > 0){
-        getFcOrgwts(swtrmtFcltFkList.filter((item): item is string => item != null), fcOrgwts?.length)
+      if (swtrmtFcltFkList.length > 0) {
+        getFcOrgwts(
+          swtrmtFcltFkList.filter((item): item is string => item != null),
+          fcOrgwts?.length
+        );
       }
     }
-  },[fcOrgwts])
-
-  useEffect(() =>{
+  }, [fcOrgwts]);
 
+  useEffect(() => {
     if (fcOrgwtsNmList && fcOrgwtsNmList.length > 0) {
-
-      console.log('fcOrgwtsNmList ', fcOrgwtsNmList)
-      console.log('fcOrgwts ', fcOrgwts)
+      console.log("fcOrgwtsNmList ", fcOrgwtsNmList);
+      console.log("fcOrgwts ", fcOrgwts);
 
       fcOrgwts?.forEach((item, index) => {
         const orgwtNm = fcOrgwtsNmList.find(
           (orgwt) => orgwt.bscFctCd === item.swtrmtFcltFk
         )?.bscFctNm;
 
-        console.log('orgwtNm ', orgwtNm)
+        console.log("orgwtNm ", orgwtNm);
         if (orgwtNm) {
           form.setValue(
             `items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts.${index}.ruseUtztnFcltNm`,
@@ -137,10 +144,8 @@ export function PbnstBuseForm({
           );
         }
       });
-    } 
-
-  },[fcOrgwtsNmList,fcOrgwts])
-
+    }
+  }, [fcOrgwtsNmList, fcOrgwts]);
 
   // fcBizs 데이터가 변경될 때마다 차수 선택 목록을 업데이트합니다.
   useEffect(() => {
@@ -294,7 +299,6 @@ export function PbnstBuseForm({
     setSumCpct(sum);
   }, [form.formState, indexMng, indexBiz]);
 
-
   const pbnstBiz = form.watch(`items.${indexMng}.fcBizs`);
   return (
     <>
@@ -527,7 +531,9 @@ export function PbnstBuseForm({
                   ).map((field, index) => (
                     <div
                       key={`fcDemands-${indexMng}-${indexBiz}=${index}`} // 이게 핵심!
-                      className="grid grid-cols-12 gap-4 mt-3"
+                      className="grid grid-cols-12 gap-4 mt-3
+                      border-b border-gray-400 pb-3
+                      "
                     >
                       <div key={index + "keySon1"} className="col-span-4">
                         <FormField
@@ -661,11 +667,11 @@ export function PbnstBuseForm({
                             <FormUi label="(계약)공급량(m3/일)">
                               <Input
                                 placeholder=""
-                                type="number"
-                                value={f.value ?? 0}
+                                type="text"
                                 onChange={(e) => {
-                                  f.onChange(Number(e.target.value));
+                                  handleCommaNumberChange(e, f.onChange);
                                 }}
+                                value={formatCommaNumber(f.value)}
                               />
                             </FormUi>
                           )}
@@ -691,7 +697,6 @@ export function PbnstBuseForm({
                           )}
                         />
                       </div>
-                      <br></br>
                     </div>
                   ))}
                 </div>
diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
index 6e13058ab..30fab689e 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
@@ -97,7 +97,7 @@ export default function MngRegFormDetail({
                                 : []
                             }
                             onSelectValue={field.onChange}
-                            value={field.value.trim()}
+                            value={field.value?.trim() ??""}
                             readOnly={formHead.option === "readOnly"}
                           />
                         );
diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
index fc4ed566e..b893f9bf4 100644
--- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
@@ -4,29 +4,38 @@ import { useWrStore } from "@/app/store";
 import {
   rainZod,
   selectClass,
-  type customRainBdst
+  type customRainBdst,
 } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import { formH1Class, formH2Class } from "@/components/lib/class/comClass";
 import {
   formatCommaNumber,
   handleCommaNumberChange,
+  handleMinusNumberChange,
 } from "@/components/lib/func/commom";
 import { DatePicker, FormUi } from "@common/business_components";
-import { Form, FormField, SelectBox } from "@common/business_components/ui";
-import { Button, Input } from "@common/components/ui";
+import {
+  Form,
+  FormField,
+  FormLabel,
+  SelectBox,
+} from "@common/business_components/ui";
+import { Button, Checkbox, Input, Label } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import BdstReg from "../bdstReg/bdstReg";
+import toast from "react-hot-toast";
 
 export default function RainRegForm({
   rainForm,
   isModal,
-  readonly = false
+  readonly = false,
+  setIsModal
 }: {
   rainForm: customRainBdst;
   isModal: boolean;
+  setIsModal?:(modal:boolean) => void
   readonly?: boolean;
 }) {
   const { code, rainBdstReg, rainBdstUpdate, rain } = useWrStore(
@@ -38,6 +47,7 @@ export default function RainRegForm({
     resolver: zodResolver(rainZod),
     defaultValues: defaultValues,
   });
+  const instlCst = form.watch(`reuseBuilding.0.instlCst`);
 
   const [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctYn] = form.watch([
     "reuseBuilding.0.grntchBdstCertYn",
@@ -69,7 +79,7 @@ export default function RainRegForm({
             ? item?.grntchBdstCertYr
             : "", // null → ""
         instlCstSprtYn: item?.instlCstSprtYn ?? "Y", // null → "Y"
-        grntchBdstCertYn:item?.grntchBdstCertYn??"Y",
+        grntchBdstCertYn: item?.grntchBdstCertYn ?? "Y",
         rainyObj: {
           ...item?.rainyObj,
           filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
@@ -79,7 +89,6 @@ export default function RainRegForm({
   };
 
   useEffect(() => {
-
     if (grntchBdstCertYn === "N") {
       form.setValue("reuseBuilding.0.grntchBdstCertYr", "");
       form.setValue("reuseBuilding.0.grntchBdstCertNo", "");
@@ -90,15 +99,25 @@ export default function RainRegForm({
       form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctCpct", 0);
       form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctPrs", "");
     }
+
+    if(grntchBdstCertYn === "D") {
+      form.setValue("reuseBuilding.0.grntchBdstCertYr", "0000");
+      form.setValue("reuseBuilding.0.grntchBdstCertNo", "확인불가");
+      form.setValue("reuseBuilding.0.grntchBdstCertGrd", "확인불가");
+    }else if (instlCstSprtYn === "D") {
+      form.setValue("reuseBuilding.0.instlCstSprtAmt", -1);
+    } else if (filtrTrtmfctYn === "D") {
+      form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctCpct", -1);
+      form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctPrs", "확인불가");
+    }
+
   }, [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctYn]);
 
-
-
+const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
 
   // form 값이 변경될 때마다 로그 출력
   useEffect(() => {
-    const subscription = form.watch((value) => {
-    });
+    const subscription = form.watch((value) => {});
     return () => subscription.unsubscribe();
   }, [form]);
 
@@ -108,7 +127,15 @@ export default function RainRegForm({
 
   const onSubmit = (values: z.infer<typeof rainZod>) => {
     if (isModal) {
-      rainBdstReg(values, "41");
+      const data = regCtpvCd?regCtpvCd:regSggcd?regSggcd:'noCd'
+      
+      if(data ==='noCd'){
+        toast.error("시도/시군구 코드를 선택해야합니다.");
+        return
+      }
+
+      rainBdstReg(values, data);
+      setIsModal(false)
     } else {
       rainBdstUpdate(values, "41");
     }
@@ -125,10 +152,14 @@ export default function RainRegForm({
           <div>
             <div className="grid grid-cols-12 flex items-center card-header">
               <h1 className="text-2xl font-medium text-label col-span-10">
-                {isModal ? "건축물 운영정보" : "빗물이용시설 정보"}
+                {isModal ? "건축물 정보" : "빗물이용시설 정보"}
               </h1>
               {!readonly && (
-                <Button type="submit" className="col-start-12 col-span-1" size={"sm"}>
+                <Button
+                  type="submit"
+                  className="col-start-12 col-span-1"
+                  size={"sm"}
+                >
                   저장
                 </Button>
               )}
@@ -142,12 +173,9 @@ export default function RainRegForm({
           ) : (
             <></>
           )}
-          <h1 className={formH1Class}>
-            기본정보
-          </h1>
-
-          <div className="grid grid-cols-4 gap-2 mt-4">
-            <div className="col-span-2">
+          <h1 className={formH1Class}>기본정보</h1>
+          <div className="grid grid-cols-6 gap-2 mt-4">
+            <div className="col-span-3">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.instlCmptnDt"
@@ -160,7 +188,8 @@ export default function RainRegForm({
                           field.value && !isNaN(new Date(field.value).getTime())
                             ? new Date(field.value)
                             : new Date(),
-                        onChange: (date: Date | undefined) => field.onChange(date),
+                        onChange: (date: Date | undefined) =>
+                          field.onChange(date),
                       }}
                       selectClass={"w-full"}
                       readOnly={readonly}
@@ -170,48 +199,95 @@ export default function RainRegForm({
               />
             </div>
 
-            <div className="col-span-2">
+            <div className="col-span-3">
               <FormField
                 control={form.control}
-                name="reuseBuilding.0.instlCst"
-                render={({ field }) => (
-                  <FormUi label="설치비">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
+                name={`reuseBuilding.0.instlCst`}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+                  return (
+                    <div className="flex items-center gap-2">
+                      <FormUi label="설치비(원)">
+                        <Input
+                          placeholder="1,000,000"
+                          type="text"
+                          className={selectClass}
+                          readOnly={readonly }
+                          value={
+                            isUnknown ? "확인불가" : formatCommaNumber(value)
+                          }
+                          onFocus={() => {
+                            // 입력 시 자동으로 확인불가 해제
+                            if (isUnknown && !readonly) {
+                              field.onChange(""); // 초기화
+                            }
+                          }}
+                          onChange={(e) => {
+                            if (readonly ) return;
+                            handleMinusNumberChange(e, field.onChange);
+                          }}
+                        />
+                      </FormUi>
+                    </div>
+                  );
+                }}
               />
             </div>
           </div>
           <div className="">
-            <h1 className={formH1Class}>
-              빗물이용시설 정보
-            </h1>
+            <h1 className={formH1Class}>빗물이용시설 정보</h1>
           </div>
           <div>
-            <h2 className={formH2Class}>집수면</h2>
+            <h2 className={formH2Class}>집수면 및 저류조</h2>
           </div>
-          <div className="grid grid-cols-10  gap-4 mt-4 ">
-            <div className="col-span-5">
+          <div className="grid grid-cols-12  gap-4 mt-4 ">
+            <div className="col-span-4">
+              <FormField
+                control={form.control}
+                name="reuseBuilding.0.rainyObj.dtfcltCpct"
+                render={({ field }) =>
+                  
+                  {
+                    const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1
+                  return (
+                  <FormUi label="저류조 용량(m³)">
+                    <Input
+                      className={selectClass}
+                      placeholder="1,000,000"
+                      type="text"
+                      value={
+                        isUnknown ? "확인불가" : formatCommaNumber(field.value)
+                      }
+                      onFocus={() => {
+                        // 입력 시 자동으로 확인불가 해제
+                        if (isUnknown && !readonly) {
+                          field.onChange(""); // 초기화
+                        }
+                      }}
+                      onChange={(e) => {
+                        if (readonly ) return;
+                        handleMinusNumberChange(e, field.onChange);
+                      }}
+                      readOnly={readonly}
+                    />
+                  </FormUi>
+                )
+              }}
+              />
+            </div>
+            <div className="col-span-4">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.pntfColKnd"
                 render={({ field }) => (
-                  <FormUi label="종류">
+                  <FormUi label="집수면 종류">
                     <SelectBox
                       className={""}
                       selectClass={selectClass}
                       label={""}
                       selectArray={rainFcltCd}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? rainFcltCd[0]?.val}
                       readOnly={readonly}
                     />
@@ -219,24 +295,40 @@ export default function RainRegForm({
                 )}
               />
             </div>
-            <div className="col-span-5">
+            <div className="col-span-4">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.pntfColArea"
-                render={({ field }) => (
-                  <FormUi label="면적(m³)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+                  return (
+                    <div className="flex items-center gap-2">
+                      <FormUi label="집수면 용량(m³)">
+                        <Input
+                          className={selectClass}
+                          placeholder="1,000,000"
+                          type="text"
+                          value={
+                            isUnknown ? "확인불가" : formatCommaNumber(value)
+                          }
+                          onFocus={() => {
+                            // 입력 시 자동으로 확인불가 해제
+                            if (isUnknown && !readonly) {
+                              field.onChange(""); // 초기화
+                            }
+                          }}
+                          onChange={(e) => {
+                            if (readonly ) return;
+                            handleMinusNumberChange(e, field.onChange);
+                          }}
+                          readOnly={readonly}
+                        />
+                      </FormUi>
+
+                    </div>
+                  );
+                }}
               />
             </div>
           </div>
@@ -255,8 +347,8 @@ export default function RainRegForm({
                       className={""}
                       selectClass={selectClass}
                       label={""}
-                      selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      selectArray={code.bdstFilterYn}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? code.yn[0]?.val}
                       readOnly={readonly}
                     />
@@ -268,47 +360,68 @@ export default function RainRegForm({
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.filtrTrtmfctCpct"
-                render={({ field }) => (
+                render={({ field }) => 
+                  
+                  
+                  {
+                  const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1
+                return(
                   <FormUi label="용량(m³/일)">
                     <Input
                       className={selectClass}
                       placeholder="1,000,000"
                       type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                      value={
+                        isUnknown ? "확인불가" : formatCommaNumber(field.value)
+                      }
+                      onFocus={() => {
+                        // 입력 시 자동으로 확인불가 해제
+                        if (isUnknown && !readonly) {
+                          field.onChange(""); // 초기화
+                        }
                       }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly }
+                      onChange={(e) => {
+                        if (readonly ) return;
+                        handleMinusNumberChange(e, field.onChange);
+                      }}
+                      readOnly={readonly}
                       disabled={filtrTrtmfctYn !== "Y"}
                     />
                   </FormUi>
-                )}
+                )
+              }}
               />
             </div>
             <div className="col-span-4">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.filtrTrtmfctPrs"
-                render={({ field }) => (
-                  <FormUi label="처리공정">
-                    <Input
-                      className={selectClass}
-                      placeholder=""
-                      type="text"
-                      value={field.value ?? ""}
-                      onChange={field.onChange}
-                      readOnly={readonly }
-                      disabled={filtrTrtmfctYn !== "Y"}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === "-"; // 또는 Number(value) === -1
+
+                  return (
+                    <div className="flex items-center gap-2">
+                      <FormUi label="처리공정">
+                        <Input
+                          className={' h-full !text-xl col-span-4' }
+                          placeholder="처리공정 입력"
+                          type="text"
+                          value={field.value ?? ""}
+                          onChange={field.onChange}
+                          readOnly={readonly}
+                          disabled={filtrTrtmfctYn !== "Y"}
+                        />
+                      </FormUi>
+       
+                    </div>
+                  );
+                }}
               />
             </div>
           </div>
           <div className=" my-2">
-            <h1 className={formH1Class}>
-              인센티브 정보
-            </h1>
+            <h1 className={formH1Class}>인센티브 정보</h1>
           </div>
           <div>
             <h2 className={formH2Class}>설치비 지원</h2>
@@ -324,8 +437,8 @@ export default function RainRegForm({
                       className={""}
                       selectClass={selectClass}
                       label={""}
-                      selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      selectArray={code.bdstIncenYn}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? code.yn[0]?.val}
                       readOnly={readonly}
                     />
@@ -337,24 +450,38 @@ export default function RainRegForm({
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.instlCstSprtAmt"
-                render={({ field }) => (
-                  <FormUi label="지원금액(원)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                render={({ field }) => 
+                 {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+                   return (
+                   <FormUi label="지원금액(원)">
+                     <Input
+                       className={selectClass}
+                       placeholder=""
+                       type="text"
+                       readOnly={readonly || isUnknown}
+                       value={
+                        isUnknown ? "확인불가" : formatCommaNumber(value)
+                      }
+                      onFocus={() => {
+                        // 입력 시 자동으로 확인불가 해제
+                        if (isUnknown && !readonly) {
+                          field.onChange(""); // 초기화
+                        }
                       }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={instlCstSprtYn !== "Y"}
-                    />
-                  </FormUi>
-                )}
+                      onChange={(e) => {
+                        if (readonly ) return;
+                        handleMinusNumberChange(e, field.onChange);
+                      }}
+                       disabled={instlCstSprtYn !== "Y"}
+                     />
+                   </FormUi>
+                 )}
+                 }
               />
             </div>
           </div>
-
           <div>
             <h2 className={formH2Class}>녹색건축물 인증</h2>
           </div>
@@ -369,8 +496,8 @@ export default function RainRegForm({
                       className={""}
                       selectClass={selectClass}
                       label={""}
-                      selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      selectArray={code.bdstIncenYn}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? code.yn[0]?.val}
                     />
                   </FormUi>
@@ -381,20 +508,38 @@ export default function RainRegForm({
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.grntchBdstCertYr"
-                render={({ field }) => (
-                  <FormUi label="인증년도">
-                    <Input
-                      className={selectClass}
-                      placeholder="2024"
-                      type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e);
-                      }}
-                      readOnly={grntchBdstCertYn !== "Y"}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => 
+                  {
+                    const isUnknown = field.value === null || field.value === "0000"; // 또는 Number(value) === -1
+                    return (
+                    <FormUi label="인증년도">
+                      <Input
+                        className={selectClass}
+                        placeholder="2024"
+                        type=""
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        value={
+                          
+                          isUnknown?'확인불가':field.value ?? ""}
+                        onChange={(e) => {
+                          if (readonly) return
+                          
+                          if (e.target.value  === '확인불가') {
+                            field.onChange('0000');
+                          }else{
+                            field.onChange(e.target.value);
+                          }
+                        }}
+                        disabled={grntchBdstCertYn !== "Y"}
+                      />
+                    </FormUi>
+                  )}
+                  }
               />
             </div>
             <div className="col-span-3 ">
@@ -411,7 +556,7 @@ export default function RainRegForm({
                       onChange={(e) => {
                         if (!readonly) field.onChange(e);
                       }}
-                      readOnly={grntchBdstCertYn !== "Y"}
+                      disabled={grntchBdstCertYn !== "Y"}
                     />
                   </FormUi>
                 )}
@@ -423,15 +568,14 @@ export default function RainRegForm({
                 name="reuseBuilding.0.grntchBdstCertGrd"
                 render={({ field }) => (
                   <FormUi label="인증등급">
-                    <Input
-                      className={selectClass}
-                      placeholder="A"
-                      type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e);
-                      }}
-                      readOnly={grntchBdstCertYn !== "Y"}
+                    <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.bdstGrntchClass}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? code.bdstGrntchClass[0]?.val}
+                      readOnly={readonly}
                     />
                   </FormUi>
                 )}
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index 205846bb4..6ab1b25c4 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -29,10 +29,11 @@ export type objSearchType = {
 
  interface BdstRegProps<T extends MoType> {
   moType: T;
+  isModal:boolean;
   setIsModal?: (open: boolean) => void;
 }
 
-export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>) {
+export function BdstReg<T extends MoType>({ moType,setIsModal,isModal }: BdstRegProps<T>) {
   const { rain, code, bdst,findBdst } = useWrStore((state) => {
     return state;
   });
@@ -45,13 +46,13 @@ export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>
   const getSelCity = (val: string | number) => {
       const cityValue = String(val); // Ensure val is treated as a string
       const data = getCity(cityValue, code.sggCd);
+
       setSelectSgg(data);
-      getSgg(data[0]?.val || "");
+     // getSgg(data[0]?.val || "");
       setObjSearch({ city: cityValue, sgg: '' });
   };
 
   const getSgg = (val: string | number) => {
-    console.log(val);
     setObjSearch({...objSearch,sgg: String(val)})
   };
 
@@ -85,10 +86,7 @@ export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>
         if (data) {
           setRainBdstForm(data); 
         }
-
-     
       }
-
   } 
 
   useEffect(()=>{
@@ -122,7 +120,7 @@ export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>
       </div>
       <div className="border-t border-gray-300 my-4"></div>
       <div className="h-auto">
-        <h1 className="text-2xl font-medium text-label pl-8">건축물 목록</h1>
+        <h1 className="text-2xl font-medium text-label pl-8">건축물 목록  (유의 사항: 신규등록하려는 건축물이 목록에 없을 경우 하단 건축물 정보에 추가하여 주시기 바랍니다.)</h1>
         <ScrollArea className="h-[30vh]">
           <div>
             <UiTable
@@ -142,9 +140,9 @@ export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>
         <ScrollArea className="h-[40vh]">
           <div>
             { moType === 'RNB'?
-              <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={true} />
+              <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={isModal} setIsModal={setIsModal} />
             :moType==='RST' 
-              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={true} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
+              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={isModal} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
                             :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true}></HtdflRegForm>
             }
               
diff --git a/apps/wr/components/ui/searchInput/searchInput.tsx b/apps/wr/components/ui/searchInput/searchInput.tsx
index 796c8c298..be63b9685 100644
--- a/apps/wr/components/ui/searchInput/searchInput.tsx
+++ b/apps/wr/components/ui/searchInput/searchInput.tsx
@@ -62,9 +62,6 @@ export default function SearchInputText({
       document.removeEventListener("mousedown", handleClickOutside);
     };
   }, []);
-useEffect(() =>{
-  console.log('searchList ', searchList)
-},[searchList])
 
   return (
     <div ref={wrapperRef}>

From 83b3fad3af3d0b752372296ce627a18583e4bddc Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Tue, 1 Jul 2025 20:38:00 +0900
Subject: [PATCH 09/44] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/rainReg/page.tsx  | 56 +++++++++++--------
 .../ruseFcltMng/fcltReg/rainReg/index.tsx     |  1 +
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
index 607b90886..b468fad03 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
@@ -21,11 +21,14 @@ import {
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components";
 import { useEffect, useState } from "react";
+import { Toaster } from "react-hot-toast";
 
 export default function Home() {
-  const { rain, code, initRain, rainSearch, getRainData } = useWrStore((state) => {
-    return state;
-  });
+  const { rain, code, initRain, rainSearch, getRainData } = useWrStore(
+    (state) => {
+      return state;
+    }
+  );
   const { rainRes } = rain;
   const [rainForm, setRainForm] = useState<customRainBdst>();
   const [issNewReg, setIsNewReg] = useState<boolean>(false);
@@ -38,10 +41,9 @@ export default function Home() {
   }>({ isOpen: false, chgBuilding: [] });
 
   useEffect(() => {
-    setIsNewReg( false)
+    setIsNewReg(false);
     if (!rain.isInit) {
-      initRain('41');
-
+      initRain("41");
     }
   }, [rain.isInit, initRain]);
 
@@ -130,35 +132,39 @@ export default function Home() {
           <div className="col-span-4 h-full min-h-0">
             <ListDiv className="min-h-0">
               {/* <ScrollArea className="h-[60vh]"> */}
-                <UiTable
-                  tableData={bdstTable || []}
-                  headlist={rain.upHeadList}
-                  pageSize={20}
-                  total={10000}
-                  headName={"건축물 목록"}
-                  cellClick={(val, headId) => {
-                    cellClick(val, headId);
-                  }}
-                  onPageChange={setPageNation}
-                >
-                </UiTable>
+              <UiTable
+                tableData={bdstTable || []}
+                headlist={rain.upHeadList}
+                pageSize={20}
+                total={10000}
+                headName={"건축물 목록"}
+                cellClick={(val, headId) => {
+                  cellClick(val, headId);
+                }}
+                onPageChange={setPageNation}
+              ></UiTable>
               {/* </ScrollArea> */}
             </ListDiv>
           </div>
           <div className="col-span-2  max-h-full">
-            
             <ListDiv className="">
               <ScrollArea className="h-[60vh]">
-              <RainRegForm
-                rainForm={rainForm ?? ({} as customRainBdst)}
-                isModal={false}
-              ></RainRegForm>
+                <RainRegForm
+                  rainForm={rainForm ?? ({} as customRainBdst)}
+                  isModal={false}
+                ></RainRegForm>
               </ScrollArea>
             </ListDiv>
           </div>
         </div>
         <UiModal
-          body={<BdstReg moType="RNB"  isModal={issNewReg} setIsModal={setIsNewReg} ></BdstReg>}
+          body={
+            <BdstReg
+              moType="RNB"
+              isModal={issNewReg}
+              setIsModal={setIsNewReg}
+            ></BdstReg>
+          }
           bodyClass="w-[68vw] max-w-none h-[90vh]"
           open={issNewReg}
           onOpenChange={(open) => {
@@ -176,6 +182,8 @@ export default function Home() {
             setBdstChgProps({ ...bdstChgProps, isOpen: open });
           }}
         />
+
+        <Toaster position="top-center" />
       </ContentsDiv>
     </>
   );
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
index 9a6c73e4e..d4cfebfca 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
@@ -173,6 +173,7 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
                   })
                 );    
               const chch=  await postFectch("/reuseFc/chgBuilding", makeCh);
+
                 if(chch.status ===200) {
                    toast.success("건축물 등록이 완료되었습니다.");
                 }else{

From f6f03a62cb233ac0000e76899675bfca7c2ae4de Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Wed, 2 Jul 2025 14:27:33 +0900
Subject: [PATCH 10/44] =?UTF-8?q?=EC=9A=B0=EB=A6=AC=EB=8F=99=EB=84=A4?=
 =?UTF-8?q?=EA=B0=80=EB=AD=84=20=EC=8B=9C=EB=8F=84=20=EC=8B=9C=EA=B5=B0?=
 =?UTF-8?q?=EA=B5=AC=20selectBox=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?,=20=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=A4=EC=A0=81=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=B0=A8=ED=8A=B8=20=EC=83=89=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMng/drgtSttn/page.tsx    |  41 ++++--
 .../prfmncSttn/pbnstPrfmncSttn/page.tsx       | 122 +++++++++++-------
 2 files changed, 105 insertions(+), 58 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
index 317e05dc6..55dbeb454 100644
--- a/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/drgtSttn/page.tsx
@@ -53,8 +53,7 @@ export default function DrgtSttn() {
     useEffect(() => {
         let resData = Array.isArray(drgtRes) ? drgtRes : [drgtRes];
         resData = resData.map((item) => {
-            console.log("item", item);
-            if(item.sggNm === '세종시'){
+            if (item.sggNm === '세종시') {
                 return {
                     ...item,
                     ctpvCd: '세종특별자치시',
@@ -64,7 +63,7 @@ export default function DrgtSttn() {
 
             return {
                 ...item,
-                ctpvCd: code.cityCd.find(ct => (ct.text == item.sggNm || (code.sggCd.find(sgg => sgg.text == item.sggNm)?.val.substring(0,2) == ct.val)))?.text,
+                ctpvCd: code.cityCd.find(ct => (ct.text == item.sggNm || (code.sggCd.find(sgg => sgg.text == item.sggNm)?.val.substring(0, 2) == ct.val)))?.text,
                 sggNm: code.sggCd.find(sgg => sgg.text == item.sggNm)?.text
             }
         })
@@ -91,13 +90,24 @@ export default function DrgtSttn() {
     }, [drgtMoRes]);
 
     const getSelCity = (val: string | number) => {
-        const cityValue = String(val); // Ensure val is treated as a string
-        const data = getCity(cityValue, code.sggCd);
-        setSelectSgg(data);
-        setObjSearch({ city: cityValue, sgg: "" });
+        const cityValue = String(val);
+
+        if (cityValue === "0") {
+            setSelectSgg([]);
+            setSelectedSgg('');
+            setObjSearch({ city: cityValue, sgg: '' });
+        } else {
+            const data = getCity(cityValue, code.sggCd);
+            setSelectSgg(data);
+
+            const firstSggVal = data.find(item => item.val === "0")?.val || (data[0]?.val ?? "");
+            setSelectedSgg(firstSggVal);
+            setObjSearch({ city: cityValue, sgg: firstSggVal });
+        }
     };
 
     const getSgg = (val: string | number) => {
+        setSelectedSgg(String(val));
         setObjSearch({ ...objSearch, sgg: String(val) });
     };
 
@@ -191,13 +201,24 @@ export default function DrgtSttn() {
                                                 sggText = code.sggCd.find((item) => item.val === objSearch?.sgg)?.text ?? '';
                                             } else {
                                                 sggText = code.sggCd.filter((item) => item.val.substring(0, 2) === objSearch?.city).map((item) => item.text);
-                                                
+
                                             }
+                                            if (sidoText === '전체') { sidoText = '' }
+
                                             if (sidoText === '세종특별자치시') {
                                                 sidoText = '세종시';
                                                 sggText = sidoText;
                                             }
-                                            drgtSearch(fromDate ?? "", toDate ?? "", [sidoText, ...sggText])
+
+                                            const searchArr = [];
+                                            if (sidoText) searchArr.push(sidoText);
+                                            if (Array.isArray(sggText)) {
+                                                searchArr.push(...sggText);
+                                            } else if (sggText) {
+                                                searchArr.push(sggText);
+                                            }
+
+                                            drgtSearch(fromDate ?? "", toDate ?? "", searchArr)
                                         }}
                                     >
                                         조회
@@ -246,7 +267,7 @@ export default function DrgtSttn() {
                         setDrgtModal({ ...drgtModal, isOpen: !drgtModal.isOpen });
                     }}
                     bodyClass={"w-[50vw] max-w-none h-[80vh]"}
-                    body={<DrgtDetailModal data={drgtModal.data}/>}
+                    body={<DrgtDetailModal data={drgtModal.data} />}
                 />
                 <Toaster position="top-center" />
             </ContentsDiv>
diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
index a50c08071..f689eb745 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
@@ -8,9 +8,11 @@ import { excelDownload, yearOptions } from "@/components/lib/func/commom";
 import SearchInputText from "@/components/ui/searchInput/searchInput";
 import { CHART_FORM, ContentsDiv, MainChart, ScrollArea, SearchBaseForm, SearchInput, SelectBox, Title, UiTable, type ChartConfig, type ReturnType } from "@common/business_components";
 import ListDiv from "@common/business_components/ui/list_div";
-import { Button, Label } from "@common/components/ui";
+import { Button, Label, Table, TableBody, TableHeader } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import toast, { Toaster } from "react-hot-toast";
+import { headMakeprfmnc } from "../../prfmncReg/chkgdnReg/TableHead";
+import { InputTableBody } from "@/components/lib/func/TableData";
 
 export default function PbnstPrfmncSttn() {
     const {
@@ -34,9 +36,9 @@ export default function PbnstPrfmncSttn() {
     const [swtrmtFcltNm, setSwtrmtFcltNm] = useState<string>();
     const [pbnRuseNm, setPbnRuseNm] = useState<string>("");
 
-     const [searchYear, setSearchYear] = useState<string>(
-            String(new Date().getFullYear())
-        );
+    const [searchYear, setSearchYear] = useState<string>(
+        String(new Date().getFullYear())
+    );
     const [excelData, setExcelData] = useState<any[]>([]);
     const excelClick = useCallback(() => {
         excelDownload(
@@ -83,15 +85,20 @@ export default function PbnstPrfmncSttn() {
     type lineChartDataProps = { label: string, val: number, color: string };
 
     const prfTableData = (prfList: PrfType[], year: string) => {
-        const inUsageData = structuredClone(initValInUsage);
-        const outUsageData = structuredClone(initValOutUsage);
-
-        const inSubtotal = structuredClone(subTotalObj);
-        const outSubtotal = structuredClone(subTotalObj);
+        const inUsageData = structuredClone(initValInUsage).map(row => ({
+            ...row,
+            구분: "장내용수",
+        }));
+        const outUsageData = structuredClone(initValOutUsage).map(row => ({
+            ...row,
+            구분: "장외용수",
+        }));
+        const inSubtotal = { ...structuredClone(subTotalObj), 구분: "장내용수" };
+        const outSubtotal = { ...structuredClone(subTotalObj), 구분: "장외용수" };
 
         const prfFilter = prfList?.filter((e) => e.ym.slice(0, 4) === year)
         if (prfList && prfFilter.length > 0) {
-            
+
             prfList?.forEach((prfItem) => {
                 const month = Number(prfItem?.ym?.slice(4)); // "MM"
                 const monthKey = `${month}월`;
@@ -142,7 +149,7 @@ export default function PbnstPrfmncSttn() {
             setPrfData([]);
         }
     }
-    
+
     const [chartId, setChartId] = useState<string>();
     useEffect(() => {
         // 누적 변수 초기화
@@ -198,8 +205,8 @@ export default function PbnstPrfmncSttn() {
             prfTableData([], year)
             rawData.forEach((item) => {
                 // 실적 테이블 데이터
-                if (chartId){
-                    if(item.prfList?.[0]?.ym.slice(0, 4) === year && item.prfList?.[0]?.pbnstRuseFcltFk === chartId){
+                if (chartId) {
+                    if (item.prfList?.[0]?.ym.slice(0, 4) === year && item.prfList?.[0]?.pbnstRuseFcltFk === chartId) {
                         prfTableData(item.prfList, year);
                     }
                     item.prfList.filter((e) => e.ym.slice(0, 4) === year && e.pbnstRuseFcltFk === chartId).forEach((element) => {
@@ -265,40 +272,40 @@ export default function PbnstPrfmncSttn() {
             });
 
             // 도넛차트 데이터
-            dnData.push({ label: "세척수", val: wshwtr, fill: "red" });
-            dnData.push({ label: "냉각수", val: coolUswtr, fill: "orange" });
-            dnData.push({ label: "청소수", val: cleanUswtr, fill: "yellow" });
-            dnData.push({ label: "식수대", val: drwtUswtr, fill: "green" });
-            dnData.push({ label: "희석용수", val: dltnUswtr, fill: "skyblue" });
-            dnData.push({ label: "중수도", val: ithlRswtr, fill: "blue" });
-            dnData.push({ label: "기타", val: ithlEtcUswtr, fill: "purple" });
-            dnData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "red" });
-            dnData.push({ label: "세척살수용수", val: resn, fill: "orange" });
-            dnData.push({ label: "조경용수", val: lndwtr, fill: "yellow" });
-            dnData.push({ label: "친수용수", val: hydUswtr, fill: "green" });
-            dnData.push({ label: "지하수충전", val: ugwtChr, fill: "skyblue" });
-            dnData.push({ label: "농업용수", val: farmUswtr, fill: "blue" });
-            dnData.push({ label: "하천등유지용수", val: rvrKeepUswtr, fill: "purple" });
-            dnData.push({ label: "공업용수", val: indstUswtr, fill: "black" });
+            dnData.push({ label: "세척수", val: wshwtr, fill: "#F7CFD8" });
+            dnData.push({ label: "냉각수", val: coolUswtr, fill: "#F4F8D3" });
+            dnData.push({ label: "청소수", val: cleanUswtr, fill: "#A6D6D6" });
+            dnData.push({ label: "식수대", val: drwtUswtr, fill: "#8E7DBE" });
+            dnData.push({ label: "희석용수", val: dltnUswtr, fill: "#FF8383" });
+            dnData.push({ label: "중수도", val: ithlRswtr, fill: "#FFF574" });
+            dnData.push({ label: "기타", val: ithlEtcUswtr, fill: "#A1D6CB" });
+            dnData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "#A19AD3" });
+            dnData.push({ label: "세척살수용수", val: resn, fill: "#B1F0F7" });
+            dnData.push({ label: "조경용수", val: lndwtr, fill: "#81BFDA" });
+            dnData.push({ label: "친수용수", val: hydUswtr, fill: "#F5F0CD" });
+            dnData.push({ label: "지하수충전", val: ugwtChr, fill: "#FADA7A" });
+            dnData.push({ label: "농업용수", val: farmUswtr, fill: "#A6AEBF" });
+            dnData.push({ label: "하천등유지용수", val: rvrKeepUswtr, fill: "#C5D3E8" });
+            dnData.push({ label: "공업용수", val: indstUswtr, fill: "#D0E8C5" });
 
             // 장내용수 도넛
-            dnInData.push({ label: "세척수", val: wshwtr, fill: "yellow" });
-            dnInData.push({ label: "냉각수", val: coolUswtr, fill: "green" });
-            dnInData.push({ label: "청소수", val: cleanUswtr, fill: "yellow" });
-            dnInData.push({ label: "식수대", val: drwtUswtr, fill: "green" });
-            dnInData.push({ label: "희석용수", val: dltnUswtr, fill: "yellow" });
-            dnInData.push({ label: "중수도", val: ithlRswtr, fill: "green" });
-            dnInData.push({ label: "기타", val: ithlEtcUswtr, fill: "yellow" });
-            dnInData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "green" });
-            dnInData.push({ label: "세척살수용수", val: resn, fill: "yellow" });
+            dnInData.push({ label: "세척수", val: wshwtr, fill: "#F7CFD8" });
+            dnInData.push({ label: "냉각수", val: coolUswtr, fill: "#F4F8D3" });
+            dnInData.push({ label: "청소수", val: cleanUswtr, fill: "#A6D6D6" });
+            dnInData.push({ label: "식수대", val: drwtUswtr, fill: "#8E7DBE" });
+            dnInData.push({ label: "희석용수", val: dltnUswtr, fill: "#FF8383" });
+            dnInData.push({ label: "중수도", val: ithlRswtr, fill: "#FFF574" });
+            dnInData.push({ label: "기타", val: ithlEtcUswtr, fill: "#A1D6CB" });
+            dnInData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "#A19AD3" });
+            dnInData.push({ label: "세척살수용수", val: resn, fill: "#B1F0F7" });
 
             // 장외용수 도넛
-            dnOutData.push({ label: "조경용수", val: lndwtr, fill: "yellow" });
-            dnOutData.push({ label: "친수용수", val: hydUswtr, fill: "black" });
-            dnOutData.push({ label: "지하수충전", val: ugwtChr, fill: "yellow" });
-            dnOutData.push({ label: "농업용수", val: farmUswtr, fill: "black" });
-            dnOutData.push({ label: "하천등유지용수", val: rvrKeepUswtr, fill: "yellow" });
-            dnOutData.push({ label: "공업용수", val: indstUswtr, fill: "black" });
+            dnOutData.push({ label: "조경용수", val: lndwtr, fill: "#81BFDA" });
+            dnOutData.push({ label: "친수용수", val: hydUswtr, fill: "#F5F0CD" });
+            dnOutData.push({ label: "지하수충전", val: ugwtChr, fill: "#FADA7A" });
+            dnOutData.push({ label: "농업용수", val: farmUswtr, fill: "#A6AEBF" });
+            dnOutData.push({ label: "하천등유지용수", val: rvrKeepUswtr, fill: "#C5D3E8" });
+            dnOutData.push({ label: "공업용수", val: indstUswtr, fill: "#D0E8C5" });
 
             // 라인차트 데이터
             setInLineData({
@@ -466,7 +473,7 @@ export default function PbnstPrfmncSttn() {
 
     useEffect(() => {
         setbdstTable(prfmncRes);
-        if(prfmncRes?.[0]?.pbnstRuseFcltPk) setChartId(prfmncRes[0].pbnstRuseFcltPk)
+        if (prfmncRes?.[0]?.pbnstRuseFcltPk) setChartId(prfmncRes[0].pbnstRuseFcltPk)
     }, [prfmncRes]);
 
 
@@ -619,12 +626,12 @@ export default function PbnstPrfmncSttn() {
                             </div>
                             <h1 className="">하수재이용실적 현황</h1>
                             <ListDiv className="col-span-8 pr-6  ">
-                                <ScrollArea className="h-[60vh]">
-                                    <div className="card-header">
+                                {/* <ScrollArea className="h-[60vh]"> */}
+                                    {/* <div className="card-header">
                                         <h3 className="text-2xl font-medium text-label">
                                             {"하수처리수재이용 실적(m3) 등록결과"}
                                         </h3>
-                                    </div>
+                                    </div> */}
 
                                     <UiTable
                                         headName={undefined}
@@ -637,7 +644,26 @@ export default function PbnstPrfmncSttn() {
                                             throw new Error("Function not implemented.");
                                         }}>
                                     </UiTable>
-                                </ScrollArea>
+
+                                    {/* <ListDiv className="col-span-8 pr-6  ">
+                                        <ScrollArea className="h-[60vh]">
+                                            <div className="card-header">
+                                                <h3 className="text-2xl font-medium text-label">
+                                                    {"하수처리수재이용 실적(m3) 등록결과"}
+                                                </h3>
+                                            </div>
+
+                                            <Table variant="secondary">
+                                                <TableHeader className="font-bold">
+                                                    {headMakeprfmnc(monthHeadList, [])}
+                                                </TableHeader>
+                                                <TableBody>
+                                                    {InputTableBody(prfData ?? [], monthHeadList, setPrfData)}
+                                                </TableBody>
+                                            </Table>
+                                        </ScrollArea>
+                                    </ListDiv> */}
+                                {/* </ScrollArea> */}
                             </ListDiv>
 
                         </ListDiv>

From c50c2685c1df40e19b1b0f32534f72eb23fcfe71 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Wed, 2 Jul 2025 14:30:18 +0900
Subject: [PATCH 11/44] =?UTF-8?q?=EC=9E=A0=EC=9E=AC=EC=88=98=EC=9A=94?=
 =?UTF-8?q?=EC=B2=98=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20=EC=97=91=EC=85=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx | 73 ++++++++++++-------
 .../app/store/matDmd/ldrmntCoSttn/excel.tsx   | 26 ++-----
 .../app/store/matDmd/ldrmntCoSttn/index.tsx   | 67 ++++++++++-------
 .../coReg/coRegExcel/coRegExcelModal.tsx      | 24 +++---
 4 files changed, 104 insertions(+), 86 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
index c5daee29c..eb43b29bf 100644
--- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
@@ -44,7 +44,7 @@ export default function LdrmntCoSttn() {
   const [searchTxt, setSearchTxt] = useState<string>();
   const ref = useRef<ReturnType>({} as ReturnType);
   const [excelData, setExcelData] = useState<any[]>();
-
+  const [isExcelDownload, setIsExcelDownload] = useState(false);
 
   const excelClick = useCallback(() => {
     excelDownload(
@@ -57,14 +57,22 @@ export default function LdrmntCoSttn() {
   }, []);
 
   const excelDownloadClick = () => {
-    downloadExcel({
-      data: excelData ?? [],
-      fileName: "잠재수요처 관리",
-      sheetNameArray: ["Sheet1"],
-      headerRange: "A1:F1"
-    })
+    ldrmntSearch(1, "10000", "0", "");
+    setIsExcelDownload(true);
   }
 
+  useEffect(() => {
+    if (isExcelDownload && excelData && excelData.length > 0) {
+      downloadExcel({
+        data: excelData,
+        fileName: "잠재수요처 관리",
+        sheetNameArray: ["Sheet1"],
+        headerRange: "A1:F1"
+      });
+      setIsExcelDownload(false);
+    }
+  }, [excelData, isExcelDownload]);
+
   const [isExcelOpen, setIsExcelOpen] = useState<{
     isModal: boolean;
   }>({ isModal: false });
@@ -73,14 +81,21 @@ export default function LdrmntCoSttn() {
     if (index !== undefined) {
       setDetailModal({ isOpen: true, data: ldrmntRes[index] });
     }
-
   }
 
   const getSelCity = (val: string | number) => {
-    const cityValue = String(val); // Ensure val is treated as a string
-    const data = getCity(cityValue, code.sggCd);
-    setSelectSgg(data);
-    setObjSearch({ city: cityValue, sgg: '' });
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      const firstSggVal = data.find(item => item.val === "0")?.val || (data[0]?.val ?? "");
+      setObjSearch({ city: cityValue, sgg: firstSggVal });
+    }
   };
 
   const getSgg = (val: string | number) => {
@@ -125,10 +140,9 @@ export default function LdrmntCoSttn() {
     setExcelData(data)
   }, [excelList])
 
-
   useEffect(() => {
-    let cityTxt = '';
-    let sggTxt = '';
+    let cityTxt = ''
+    let sggTxt = ''
 
     if (objSearch?.city.toString().length > 0) {
       cityTxt = code.cityCd.find((item) => item.val === objSearch?.city)?.text ?? '';
@@ -138,21 +152,23 @@ export default function LdrmntCoSttn() {
       sggTxt = code.sggCd.find((item) => item.val === objSearch?.sgg)?.text ?? '';
     }
 
-    let cityNm = "";
+    if (cityTxt === '전체' || cityTxt === '') {
+      cityTxt = '0'
+    }
+
+    let cityNm = ""
 
     if (sggTxt !== "0") {
-      cityNm = cityTxt + " " + sggTxt;
+      cityNm = cityTxt + " " + sggTxt
     } else {
-      cityNm = cityTxt;
+      cityNm = cityTxt
     }
-
     if (cityNm) {
-      if (cityTxt === '') cityNm = "0";
-      ldrmntSearch(pageNation, cityNm, searchTxt || "");
+      ldrmntSearch(pageNation, '20', cityNm, searchTxt || "");
     } else {
-      ldrmntSearch(pageNation, "", searchTxt || "");
+      ldrmntSearch(pageNation, '20', '0', searchTxt || "");
     }
-  }, [pageNation, objSearch, code, searchTxt, ldrmntSearch])
+  }, [pageNation]);
 
   return (
     <>
@@ -175,6 +191,7 @@ export default function LdrmntCoSttn() {
                     label="시군구"
                     selectClass={""}
                     selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
                     onSelectValue={getSgg}
                   />
                   <SearchInput
@@ -189,7 +206,7 @@ export default function LdrmntCoSttn() {
               </SearchFormLeft>
               <SearchFormRight
                 className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
-                <div className="flex flex-row space-x-2">
+                <div className="flex flex-row space-x-2 items-center">
                   <Button
                     size={"sm"}
                     onClick={(e) => {
@@ -205,6 +222,10 @@ export default function LdrmntCoSttn() {
                         sggTxt = code.sggCd.find((item) => item.val === objSearch?.sgg)?.text ?? '';
                       }
 
+                      if (cityTxt === '전체' || cityTxt === '') {
+                        cityTxt = '0'
+                      }
+
                       let cityNm = ""
 
                       if (sggTxt !== "0") {
@@ -212,10 +233,8 @@ export default function LdrmntCoSttn() {
                       } else {
                         cityNm = cityTxt
                       }
-
                       if (cityNm) {
-                        if (cityTxt === '') cityNm = "0";
-                        ldrmntSearch(pageNation, cityNm, searchTxt || "");
+                        ldrmntSearch(pageNation, '20', cityNm, searchTxt || "");
                       }
                     }}
                   >
diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx
index dc0601127..ad7990cfc 100644
--- a/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx
+++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/excel.tsx
@@ -46,29 +46,17 @@ export const names: nameMap = {
 }
 
 
-export const excelPbnstSttnParsing = (data: any[]): string[][] => {
+export const excelLdrmntParsing = (data: any[]): string[][] => {
 
     const excelExportData: string[][] = [];
-
     data.forEach((item) => {
         excelExportData.push([
-            item.rvbsn,
-            String(item.lgbsn),
-            item.mdmbsn ?? "",
-            item.rgnNm ?? "",
-            String(item.sido ?? ""),
-            String(item.gugun ?? ""),
-            String(item.bscFctNm ?? ""),
-            String(item.efflWqltStndrdNm ?? ""),
-            String(item.fctCpc ?? ""),
-            String(item.tel ?? ""),
-            String(item.ruseUtztnFcltNm ?? ""),
-            String(item.fcltCpct ?? ""),
-            String(item.splyExtraCpct ?? ""),
-            String(item.ruseCpct ?? ""),
-            String(item.usageTotal ?? ""),
-            String(item.inUsage ?? ""),
-            String(item.outUsage ?? ""),
+            item.fctryAddr?.split(" ")[0] || "",
+            item.fctryAddr?.split(" ")[1] || "",
+            item.dmdCoNm,
+            item.fctryAddr,
+            item.fctryMngNo,
+            item.telno,
         ])
     })
     return excelExportData;
diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
index d1176528a..6a5f18247 100644
--- a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
@@ -2,10 +2,8 @@ import type { CommonTableProps } from "@/app/store/common/type/header";
 import { deleteFectch, fetchType, getFetch, postFectch, putFectch } from "@/components/lib/api";
 import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import { z } from "zod";
-import { ldrmntHeadListExport, ldrmntNodeListExport, ldrmntZod } from "./headList";
 import { TEST_UUID } from "../../ruseFcltMng/fcltReg/rainReg";
-
-
+import { ldrmntHeadListExport, ldrmntNodeListExport, ldrmntZod } from "./headList";
 
 // 테이블 헤드 리스트
 const ldrmntHeadList = ldrmntHeadListExport;
@@ -34,7 +32,7 @@ const excelDownList: ExcelType[] = [];
 type ldrmntActions = {
   ldrmntRegData: (data: any[]) => void,
   ldrmntInit: (con: string) => void
-  ldrmntSearch: (page: number, sggCd: string, coNm: string) => void;
+  ldrmntSearch: (page: number, sggCd: string, total: string, coNm: string) => void;
   ldrmntUpdate: (ldrmntRes: customLdrmnt) => void;
   ldrmntDelete: () => void;
 };
@@ -61,6 +59,7 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
           fetchType.WR,
           `/reuseFc/request/temp/1/20/${con}`
         );
+
         set((state: ldrmntState) => {
           return {
             ...state,
@@ -68,6 +67,7 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
               ...state.ldrmnt,
               ldrmntRes: ldrmntRes,
               isInit: false,
+              excelList: excelDownList,
             },
           }
         });
@@ -101,44 +101,57 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
 
       }
     },
-    ldrmntSearch: async (page: number, sggCd: string, coNm: string) => {
+    ldrmntSearch: async (page: number, total: string, sggCd: string, coNm: string) => {
       let searchUrl = "";
 
       if (sggCd !== "") {
         if (coNm !== "") {
-          searchUrl = `/reuseFc/request/temp/${page}/20/${sggCd}/${coNm}`;
+          searchUrl = `/reuseFc/request/temp/${page}/${total}/${sggCd}/${coNm}`;
         } else {
-          searchUrl = `/reuseFc/request/temp/${page}/20/${sggCd}`;
+          searchUrl = `/reuseFc/request/temp/${page}/${total}/${sggCd}`;
         }
       }
-
       try {
         const ldrmntRes = await getFetch(
           fetchType.WR,
           searchUrl
         );
 
-        ldrmntRes.forEach((item: customLdrmnt) => {
-          excelDownList.push({
-            ctpvCd: item.ctpvCd,
-            sggCd: item.sggCd,
-            dmdCoNm: item.dmdCoNm,
-            fctryAddr: item.fctryAddr,
-            fctryMngNo: item.fctryMngNo,
-            telno: item.telno,
+        if (Number(total) > 5000) {
+          let excelDownList: ExcelType[] = [];
+          ldrmntRes.forEach((item: customLdrmnt) => {
+            excelDownList.push({
+              ctpvCd: item.ctpvCd,
+              sggCd: item.sggCd,
+              dmdCoNm: item.dmdCoNm,
+              fctryAddr: item.fctryAddr,
+              fctryMngNo: item.fctryMngNo,
+              telno: item.telno,
+            })
           })
-        })
+          set((state: ldrmntState) => {
+            return {
+              ...state,
+              ldrmnt: {
+                ...state.ldrmnt,
+                excelList: excelDownList,
 
-        set((state: ldrmntState) => {
-          return {
-            ...state,
-            ldrmnt: {
-              ...state.ldrmnt,
-              ldrmntRes: ldrmntRes,
-              excelList: excelDownList,
-            },
-          }
-        })
+              },
+            };
+          });
+          return excelDownList;
+        } else
+          set((state: ldrmntState) => {
+            return {
+              ...state,
+              ldrmnt: {
+                ...state.ldrmnt,
+                ldrmntRes: ldrmntRes,
+                isInit: false,
+              },
+            };
+          });
+        return ldrmntRes;
       } catch (e) {
         console.log(e)
       }
diff --git a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
index 34d46043f..89f15a3cc 100644
--- a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
+++ b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
@@ -4,9 +4,9 @@ import type { customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn";
 import { names } from "@/app/store/matDmd/ldrmntCoSttn/excel";
 import { filePicked, FileUpload, FormUi, Title } from "@common/business_components/ui";
 import { Form, FormField } from "@common/business_components/ui/form";
-import { Button } from "@common/components/ui";
+import { Button, Progress } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import type { z } from "zod";
 
@@ -30,20 +30,20 @@ export default function CoRegExcel() {
         try {
           let array: { [key: string]: string | number }[] = []
           let isError = false;
-          if (Array.isArray(res)){
+          if (Array.isArray(res)) {
             res.some((item, index) => {
               let object: { [key: string]: string | number } = {}
               Object.keys(names).some((key) => {
                 if (item && names[key] !== undefined) {
-                  if (key === "공장관리번호") {
-                    item[key] = String(item[key])
-                  } else {
-                    object[names[key] as string] = item[key];
-                  }
+                  // if (key === "공장관리번호") {
+                  //   item[key] = String(item[key])
+                  // } else {
+                  object[names[key] as string] = item[key];
+                  // }
                 }
                 return false;
               })
-              if(isError === true)
+              if (isError === true)
                 return true;
               array.push(object)
 
@@ -55,8 +55,8 @@ export default function CoRegExcel() {
               return false;
             })
           }
-          if(isError === false)
-          ldrmntRegData(array);
+          if (isError === false)
+            ldrmntRegData(array);
         } catch (e) {
           console.log(e)
           alert(e)
@@ -67,7 +67,6 @@ export default function CoRegExcel() {
     };
   }
 
-
   return (
     <>
       <div>
@@ -87,7 +86,6 @@ export default function CoRegExcel() {
             </div>
 
             <div>
-
               <FormField
                 control={form.control}
                 name="file"

From e36bfe726786608eae8794c1ef1a7ea761d13ce5 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Wed, 2 Jul 2025 16:14:18 +0900
Subject: [PATCH 12/44] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=A0=90=EA=B2=80?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  |  20 ++--
 .../chkgdnReg/rainChkgdn/headList.tsx         |   2 +-
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  |  12 +--
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx |  38 +++----
 apps/wr/components/lib/func/TableData.tsx     |   2 +-
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   | 101 ++++++++++--------
 .../chkgdTable/rswtChkgd/rswtChkgdTable.tsx   |  27 +++--
 7 files changed, 115 insertions(+), 87 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index fd8e2a6d6..53a7a31f3 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -31,7 +31,6 @@ import { useCallback, useEffect, useState } from "react";
 import { Toaster } from "react-hot-toast";
 import { shallow } from "zustand/shallow";
 
-//-----------------------
 export default function Page() {
   const {
     code,
@@ -43,7 +42,6 @@ export default function Page() {
     rainChkExcelDownload,
     rainChkHeadChange,
     isRainSttn,
-
     rswtChkgdnInit,
     rswtChkPolInit,
     rswtChkDetilsUpdate,
@@ -61,7 +59,7 @@ export default function Page() {
     rswtrChkDetailsZodType[]
   >([]);
   const [deleteIdx, setDeleteIdx] = useState<number[]>([]);
-
+  const [pageNation, setPageNation] = useState(1);
   const [selFcltDiv, setSelFcltDiv] = useState("RNB");
   const [isModal, setIsModal] = useState({
     open: false,
@@ -70,9 +68,9 @@ export default function Page() {
   const cellClick = () => {
     if (searchYear)
       if (selFcltDiv === "RNB") {
-        rainChkInit(searchYear, "0");
+        rainChkInit("1", "20", searchYear, "0");
       } else {
-        rswtChkgdnInit(searchYear, "0");
+        rswtChkgdnInit("1", "20", searchYear, "0");
       }
   };
 
@@ -82,14 +80,14 @@ export default function Page() {
 
   useEffect(() => {
     if (!rainChkgdn.isInit) {
-      rainChkInit(new Date().getFullYear().toString(), "0");
+      rainChkInit("1", "20", new Date().getFullYear().toString(), "0");
       isRainSttn(false);
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
 
     if (!rswtChkgdn.isInit) {
-      rswtChkgdnInit(new Date().getFullYear().toString(), "0");
+      rswtChkgdnInit("1", "20", new Date().getFullYear().toString(), "0");
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
@@ -179,9 +177,11 @@ export default function Page() {
                   selectClass={""}
                   selectArray={yearOptions}
                   value={searchYear}
-                  onSelectValue={(val: string | number) =>
+                  onSelectValue={(val: string | number) => {
                     setSearchYear(String(val))
                   }
+
+                  }
                 />
               </div>
               <div className="col-span-2 flex flex-row space-x-2">
@@ -255,6 +255,8 @@ export default function Page() {
                 detailUp={setUpdateRainDetail}
                 handleClick={handleClick}
                 rainChkData={rainChkgdn.rainChk}
+                pageNation={pageNation}
+                onPageChange={setPageNation}
               />
             ) : (
               <RswtChkgdTable
@@ -262,6 +264,8 @@ export default function Page() {
                 deleteRswtData={setDeleteIdx}
                 handleRswtClick={handleClick}
                 rswtChkData={rswtChkgdn.rswtChkRes}
+                pageNation={pageNation}
+                onPageChange={setPageNation}
               />
             )}
           </ListDiv>
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
index d8057cad6..d7335e129 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
@@ -134,7 +134,7 @@ export const rainChkgdnHeadListExport: TableUpperProps[] = [
   { id: "dtfcltCpct", title: "빗물저류조용량(m³)", mergeCell: true },
   { id: "chckYmd", title: "점검일", mergeCell: true },
   { id: "utztnUsgCd", title: "이용용도" },
-  { id: "totalSplyUswtrUtztnQnt", title: "연간보급수이용량(m³)" },
+  { id: "totalSplyUswtrUtztnQnt", title: "연간대체수이용량(m³)" },
   { id: "totalRuseFcltUtztnQnt", title: "연간빗물이용량(m³)" },
   {
     id: "ph",
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 3bd10169f..4af27a51c 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -52,7 +52,7 @@ export type rainChkgdnState = {
 };
 
 type rainChkgdnActions = {
-  rainChkInit: (sggCd: string, searchTxt: string) => void;
+  rainChkInit: (pageNo: string, cnt: string, sggCd: string, searchTxt: string) => void;
   rainChkDetilUpdate(rainChk: rainChkZodType[]): Promise<void>;
   rainChkGuidUpdate(rainChk: rainChkZodType): Promise<void>;
   rainChkExcelDownload(
@@ -98,11 +98,11 @@ const makeMdfrChk = (data: rainChkZodType[], type: string, toDo: string) => {
   return chData;
 };
 
-const initFetch = async (txt: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: string, cnt: string, txt: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
   const rainRes = await getFetch(
     "wr",
-    `/reuseChk/rainy` + (txt ? `/${txt}` : currentYear) + (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/rainy` + (pageNo ? `/${pageNo}` : "/1") + (cnt ? `/${cnt}` : "/20") + (txt ? `/${txt}` : `/${currentYear}`) + (sgg ? `/${sgg}` : "/0")
   );
   return rainRes;
 };
@@ -140,7 +140,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rainChkRes = await initFetch(currentYear, "0");
+        const rainChkRes = await initFetch("1", "20", currentYear, "0");
         return set((state: rainChkgdnState) => ({
           ...state,
           rainChkgdn: {
@@ -156,9 +156,9 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         });
       }
     },
-    rainChkInit: async (searchTxt: string, sggCd: string) => {
+    rainChkInit: async (pageNo: string, cnt: string, searchTxt: string, sggCd: string) => {
       try {
-        const rainChkRes = await initFetch(searchTxt, sggCd);
+        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
         return set((state: rainChkgdnState) => ({
           ...state,
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index 1cc7bd766..acc6ccaba 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -3,7 +3,7 @@ import {
 } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import type {
   SelectDataType,
-   SheetParameter,
+  SheetParameter,
 } from "@common/business_components";
 import {
   deleteFectch,
@@ -41,12 +41,12 @@ export type rswtChkgdnState = {
     rswtChkRes: rswtChkZodType[];
     rswtChkPolGuide: rswtChkZodType[];
     isInit: boolean;
-    isSttn:boolean
+    isSttn: boolean
   };
 };
 
 type rswtChkgdnActions = {
-  rswtChkgdnInit: (year: string, sggCd: string) => void;
+  rswtChkgdnInit: (pageNo: string, cnt: string, year: string, sggCd: string) => void;
   rswtrChkExcelDownload(
     sidoCode: SelectDataType[],
     sggCode: SelectDataType[]
@@ -57,7 +57,7 @@ type rswtChkgdnActions = {
   rswtChkPolAndGuide: (chkGdnPk: number) => void;
   rswtChkPolInit: () => void;
   rwstPolAndGuideUpdate: (rswtChk: rswtChkZodType[]) => void;
-  rswtChkHeadChange:  (rswtChkgdn: rswtChkgdnState, isEdit: boolean) => void;
+  rswtChkHeadChange: (rswtChkgdn: rswtChkgdnState, isEdit: boolean) => void;
 };
 
 export type rswtChkgdnType = rswtChkgdnState & rswtChkgdnActions;
@@ -75,17 +75,19 @@ export const rswtChkgdnStateExport: rswtChkgdnState = {
     rswtChkRes: [],
     rswtChkPolGuide: [],
     isInit: false,
-    isSttn:false,
+    isSttn: false,
   },
 };
 
-const initFetch = async (year: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: string, cnt: string, year: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
   const rswtChkRes = await getFetch(
     "wr",
-    `/reuseChk/reuseWater/` +
-      (year ? `${year}` : currentYear) +
-      (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/reuseWater` +
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/20") +
+    (year ? `/${year}` : `/${currentYear}`) +
+    (sgg ? `/${sgg}` : "/0")
   );
   return rswtChkRes;
 };
@@ -137,9 +139,9 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         },
       }));
     },
-    rswtChkgdnInit: async (year: string, sggCd: string) => {
+    rswtChkgdnInit: async (pageNo: string, cnt: string, year: string, sggCd: string) => {
       try {
-        const rswtChkRes = await initFetch(year, sggCd);
+        const rswtChkRes = await initFetch(pageNo, cnt, year, sggCd);
 
         return set((state: rswtChkgdnState) => ({
           ...state,
@@ -163,7 +165,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch(currentYear, "0");
+        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -188,7 +190,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch(currentYear, "0");
+        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -212,7 +214,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch(currentYear, "0");
+        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -238,7 +240,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: rswtChkPolGuide,
           },
         }));
-      } catch (error) {}
+      } catch (error) { }
     },
     rswtChkPolInit: () => {
       try {
@@ -249,7 +251,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: undefined,
           },
         }));
-      } catch (error) {}
+      } catch (error) { }
     },
     rwstPolAndGuideUpdate: async (rswtChk: rswtChkZodType[]) => {
       try {
@@ -265,7 +267,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch(currentYear, "0");
+        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -299,7 +301,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtDetailHeadList: rswtDetailHeadList,
           },
         }));
-      } catch (e) {}
+      } catch (e) { }
     },
   };
 };
diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx
index 39c8b7739..9ac26827d 100644
--- a/apps/wr/components/lib/func/TableData.tsx
+++ b/apps/wr/components/lib/func/TableData.tsx
@@ -54,7 +54,7 @@ export const rainChkTableData = (chkData: rainChkZodType[]) => {
 export const rswtChkTableData = (chkData: rswtChkZodType[]) => {
   // 1. chkgdnFk + utztnUsgCd 기준 누계 정보 만들기
   const makeRswtData: any[] = [];
-  chkData.forEach((root) => {
+  chkData?.forEach((root) => {
     root.rswtrDetails.forEach((detail) => {
       let flatRswtChk = {};
       const findGuide = root.guideDetails.find(
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index d0ad437b3..5166b461f 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -16,22 +16,27 @@ import {
   TableHeader,
 } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
+import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 export default function RainChkgdTable({
-  detailUp, 
-  handleClick=() => {},
+  detailUp,
+  handleClick = () => { },
   deleteData,
   rainChkData,
+  pageNation,
+  onPageChange,
 }: {
   detailUp: (data: rainChkZodType[]) => void;
-  handleClick?: (data:any) => void;
-  deleteData:(selectedIds:number[])=>void
+  handleClick?: (data: any) => void;
+  deleteData: (selectedIds: number[]) => void
   rainChkData?: rainChkZodType[];
+  pageNation: number;
+  onPageChange: (page: number) => void;
 }) {
-  const { code, rainChkgdn ,rainChkSttn,getRainSttnExcel } = useWrStore((state) => state);
+  const { code, rainChkgdn, rainChkSttn, getRainSttnExcel } = useWrStore((state) => state);
   const [makeTableData, setMakeTableData] = useState<any[]>([]);
   const [selectedIds, setSelectedIds] = useState<number[]>([]);
   const [upRaintDetail, setUpRaintDetail] = useState<rainChkZodType[]>([]);
-  const [headList, setHeadList] = useState< {headList:TableUpperProps[],upHeadList:chHeadType[]}>({headList:[], upHeadList:[]});
+  const [headList, setHeadList] = useState<{ headList: TableUpperProps[], upHeadList: chHeadType[] }>({ headList: [], upHeadList: [] });
 
 
   const toggleSelection = (pk: number, checked: boolean) => {
@@ -46,29 +51,29 @@ export default function RainChkgdTable({
   ) => {
 
     setMakeTableData((prev) =>
-      prev.map((row, idx) =>  {
-       return idx === rowIndex ? { ...row, [field]: value } : row
+      prev.map((row, idx) => {
+        return idx === rowIndex ? { ...row, [field]: value } : row
       }
       )
     );
   };
 
-  const handleCellClick= useCallback((index: number, headId: string) => {
+  const handleCellClick = useCallback((index: number, headId: string) => {
     if (
       headId === "totalSplyUswtrUtztnQnt" ||
       headId === "totalRuseFcltUtztnQnt"
     ) {
-    
+
       handleClick(makeTableData[index])
     }
 
-  },[makeTableData, handleClick]);
+  }, [makeTableData, handleClick]);
 
 
 
   useEffect(() => {
     setSelectedIds([])// 셀렉트 초기화를 위한 작업
-    if(rainChkData){
+    if (rainChkData) {
       const rainChg = rainChkData.map((item: any) => {
         const bud = tableData([item.building], { code });
         return {
@@ -83,10 +88,10 @@ export default function RainChkgdTable({
 
   useEffect(() => {
     //데이터를 평탄화 한것중에 체크박스 선택한 테이블만 선택
-   
+
     //현황 페이지에서 필요한 엑셀 데이터를 바뀔때마다 넣기 위해서 
     getRainSttnExcel(makeTableData);
-    const selectedData = makeTableData.filter((item) =>selectedIds.includes(item.chkgdnPk));
+    const selectedData = makeTableData.filter((item) => selectedIds.includes(item.chkgdnPk));
 
     if (selectedData.length > 0) {
       const updateTableData = rainChkgdn.rainChk
@@ -101,7 +106,7 @@ export default function RainChkgdTable({
               );
 
               if (findRain != undefined) {
-                  console.log(findRain)
+                console.log(findRain)
                 return {
                   ...rd,
                   ph: Number(findRain.ph),
@@ -127,34 +132,34 @@ export default function RainChkgdTable({
           }
         })
         .filter(Boolean);
-        
+
 
       setUpRaintDetail(updateTableData as rainChkZodType[]);
     }
-  }, [makeTableData,selectedIds]);
+  }, [makeTableData, selectedIds]);
 
   useEffect(() => {
     detailUp(upRaintDetail);
 
   }, [upRaintDetail]);
 
-  useEffect(() =>{
-    if(selectedIds.length >0){
+  useEffect(() => {
+    if (selectedIds.length > 0) {
       // 삭제를 위한 데이터 삽입
-      deleteData(selectedIds )
+      deleteData(selectedIds)
     }
-  },[selectedIds])
+  }, [selectedIds])
 
 
   ///현황일 경우 input 비활성화 한다.
-  useEffect(() => { 
-    if(rainChkSttn.isSttn){
-      
+  useEffect(() => {
+    if (rainChkSttn.isSttn) {
+
       setHeadList({
         headList: rainChkSttn.rainChkgdnHeadList,
         upHeadList: rainChkSttn.rainHeadNm
       })
-    }else{
+    } else {
       setHeadList({
         headList: rainChkgdn.rainChkgdnHeadList,
         upHeadList: rainChkgdn.rainHeadNm
@@ -162,28 +167,36 @@ export default function RainChkgdTable({
 
     }
 
-  }, [rainChkSttn.isSttn, rainChkgdn.rainChkgdnHeadList , rainChkSttn.rainChkgdnHeadList]);
+  }, [rainChkSttn.isSttn, rainChkgdn.rainChkgdnHeadList, rainChkSttn.rainChkgdnHeadList]);
 
 
   return (
-    <Table variant="secondary">
-      <TableHeader className="font-bold">
-        {headMakeprfmnc(
-          headList?.headList,
-          headList?.upHeadList
-        )}
-      </TableHeader>
+    <>
+      <Table variant="secondary">
+        <TableHeader className="font-bold">
+          {headMakeprfmnc(
+            headList?.headList,
+            headList?.upHeadList
+          )}
+        </TableHeader>
 
-      <TableBody>
-        {chRowspanTable(
-          makeTableData,
-          headList.headList,
-          handleChange,
-          toggleSelection,
-          selectedIds,
-          handleCellClick
-        )}
-      </TableBody>
-    </Table>
+        <TableBody>
+          {chRowspanTable(
+            makeTableData,
+            headList.headList,
+            handleChange,
+            toggleSelection,
+            selectedIds,
+            handleCellClick
+          )}
+        </TableBody>
+      </Table>
+      <UiPageNations
+        total={rainChkData?.length ?? 0}
+        cur={pageNation}
+        pageSize={20}
+        onPageChange={onPageChange}
+      />
+    </>
   );
 }
diff --git a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
index da6cacc9a..31891a595 100644
--- a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
@@ -14,22 +14,27 @@ import {
 } from "@/components/lib/func/TableData";
 import { Table, TableBody, TableHeader } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
+import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 
 export default function RswtChkgdTable({
   detaiRswtlUpdate,
-  handleRswtClick = () => {},
+  handleRswtClick = () => { },
   deleteRswtData,
   rswtChkData,
+  pageNation,
+  onPageChange,
 }: {
   detaiRswtlUpdate: (data: rswtrChkDetailsZodType[]) => void;
   handleRswtClick?: (data: any) => void;
   deleteRswtData: (selectedIds: number[]) => void;
   rswtChkData: rswtChkZodType[];
+  pageNation: number;
+  onPageChange: (page: number) => void;
 }) {
-  const { code, rswtChkgdn,rswtChkSttn , rswtChkgdnInit, rswtChkPolAndGuide,getRswtSttnExcel } = useWrStore(
+  const { code, rswtChkgdn, rswtChkSttn, rswtChkgdnInit, rswtChkPolAndGuide, getRswtSttnExcel } = useWrStore(
     (state) => state
   );
-  const [headList, setHeadList] = useState< {headList:TableUpperProps[],upHeadList:chHeadType[]}>({headList:[], upHeadList:[]});
+  const [headList, setHeadList] = useState<{ headList: TableUpperProps[], upHeadList: chHeadType[] }>({ headList: [], upHeadList: [] });
 
   const [makeTableData, setMakeTableData] = useState<any[]>([]);
   const [selectedIds, setSelectedIds] = useState<number[]>([]);
@@ -111,22 +116,20 @@ export default function RswtChkgdTable({
   }, [selectedIds]);
 
   ///현황일 경우 input 비활성화 한다.
-  useEffect(() => { 
-    if(rswtChkSttn.isSttn){
+  useEffect(() => {
+    if (rswtChkSttn.isSttn) {
       setHeadList({
         headList: rswtChkSttn.rswtChkSttnHeadList,
         upHeadList: rswtChkSttn.rswtSttnHeadNm
       })
-    }else{
+    } else {
       setHeadList({
         headList: rswtChkgdn.rswtChkHeadList,
         upHeadList: rswtChkgdn.rswtHeadNm
       })
 
     }
-
-  }, [rswtChkSttn.isSttn, rswtChkgdn.rswtChkHeadList , rswtChkSttn.rswtChkSttnHeadList]);
-
+  }, [rswtChkSttn.isSttn, rswtChkgdn.rswtChkHeadList, rswtChkSttn.rswtChkSttnHeadList]);
 
   return (
     <>
@@ -146,6 +149,12 @@ export default function RswtChkgdTable({
           )}
         </TableBody>
       </Table>
+      <UiPageNations
+        total={rswtChkData?.length ?? 0}
+        cur={pageNation}
+        pageSize={20}
+        onPageChange={onPageChange}
+      />
     </>
   );
 }

From a4089a6589848932ae2dc3eb334bfdaffbb0f199 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Wed, 2 Jul 2025 16:21:54 +0900
Subject: [PATCH 13/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=EC=8B=9C=EC=84=A4=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/htdflReg/page.tsx | 143 ++++----
 .../app/ruseFcltMng/fcltReg/rswtReg/page.tsx  |   2 +-
 apps/wr/app/store/common/code/basicCode.tsx   | 204 ++++++++++++
 apps/wr/app/store/common/code/index.ts        | 274 +++------------
 .../ruseFcltMng/fcltReg/bdstReg/index.tsx     |   7 +-
 .../ruseFcltMng/fcltReg/htdflReg/headList.tsx |  10 +
 .../ruseFcltMng/fcltReg/htdflReg/index.tsx    |  79 ++---
 .../ruseFcltMng/fcltReg/rainReg/type.tsx      |  40 ++-
 .../ui/form/fcltReg/bdstReg/bdstReg.tsx       | 309 ++++++++---------
 .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 226 ++++++++-----
 .../fcltReg/pbnstReg/buseReg/bugRegForm.tsx   |  42 ++-
 .../mngRegFormDetail/mngRegFormDetail.tsx     |   4 +
 .../ui/form/fcltReg/rainReg/rainRegForm.tsx   | 305 ++++++++---------
 .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 314 ++++++++++--------
 .../fcltReg/bdstRegModal/bdstRegModal.tsx     |   9 +-
 .../ruseMngTableForm/ruseMngTableForm.tsx     |  73 ++--
 16 files changed, 1126 insertions(+), 915 deletions(-)
 create mode 100644 apps/wr/app/store/common/code/basicCode.tsx
 create mode 100644 apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
index 8227e0347..33cfa3bba 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
@@ -16,71 +16,68 @@ import { Button } from "@common/components";
 import ListDiv from "@common/business_components/ui/list_div";
 import { useEffect, useState } from "react";
 import { tableData } from "@/components/lib/func/commom";
-import  HtdflRegForm  from "@/components/ui/form/fcltReg/htdflReg/htdflRegForm";
+import HtdflRegForm from "@/components/ui/form/fcltReg/htdflReg/htdflRegForm";
 import type { chgBuilding } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal";
 import type { customHtdflBdst } from "@/app/store/ruseFcltMng/fcltReg/htdflReg";
 import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 
 export default function Home() {
-  const { code, htdfl, initHtdfl,getHtdflBdstData } = useWrStore((state) => state);
+  const { code, htdfl, initHtdfl, getHtdflBdstData } = useWrStore(
+    (state) => state
+  );
   const [searchTxt, setSearchTxt] = useState("");
   const [pageNation, setPageNation] = useState(1);
 
   const [htdflForm, setHtdflForm] = useState<customHtdflBdst>();
   const [bdstTable, setbdstTable] = useState<customHtdflBdst[]>();
-  const [issNewReg,setIsNewReg] = useState<boolean>( false);
+  const [issNewReg, setIsNewReg] = useState<boolean>(false);
+
+  const [bdstChgProps, setBdstChgProps] = useState<{
+    isOpen: boolean;
+    chgBuilding: chgBuilding[];
+  }>({ isOpen: false, chgBuilding: [] });
 
-   const [bdstChgProps, setBdstChgProps] = useState<{
-      isOpen: boolean;
-      chgBuilding: chgBuilding[];
-    }>({ isOpen: false, chgBuilding: [] });
-  
   const { htdflRes } = htdfl;
 
   useEffect(() => {
     if (!htdfl.isInit) {
-      initHtdfl('0');
     }
   }, [htdfl.isInit, initHtdfl]);
-
   useEffect(() => {
     if (code.sggCd.length > 0) {
-
-        const htdflData = tableData(htdflRes, { code }).map(
-                    (item: customHtdflBdst) => {
-                      return {
-                        ...item,
-                        bdstChgYn: item?.chgBuilding && item.chgBuilding.length > 0 && item.chgBuilding[0]?.bdstChgNm !== null ? 'Y' : 'N',
-                        bdstUsgCd: item.reuseBuilding[0]?.bdstUsgCd
-                      };
-                    }
-                  );
-            setbdstTable(htdflData);
+      const htdflData = tableData(htdflRes, { code }).map(
+        (item: customHtdflBdst) => {
+          return {
+            ...item,
+          };
+        }
+      );
+      setbdstTable(htdflData);
     }
   }, [code, htdflRes]);
 
-  const cellClick: (val: number|undefined  ,headId: string)  => void = (
-    val
-    ,headId) => {
+  const cellClick: (val: number | undefined, headId: string) => void = (
+    val,
+    headId
+  ) => {
     if ((bdstTable ?? []).length > 0 && val !== undefined) {
       {
         setHtdflForm(htdflRes[val]);
       }
     }
-
-      if (headId === "bdstChgYn" && val !== undefined) {
-          if (
-            htdflRes[val]?.bdstInfoPk != null &&
-            htdflRes[val]?.chgBuilding?.length > 0
-          ) {
-            bdstChgModal(htdflRes[val]?.chgBuilding as chgBuilding[]);
-          }
-        }
-  };
-  const bdstChgModal = (chgBuilding: chgBuilding[]) => {
-    setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding });
+    // if (headId === "bdstChgYn" && val !== undefined) {
+    //   if (
+    //     htdflRes[val]?.bdstInfoPk != null &&
+    //     htdflRes[val]?.chgBuilding?.length > 0
+    //   ) {
+    //     bdstChgModal(htdflRes[val]?.chgBuilding as chgBuilding[]);
+    //   }
+    // }
   };
+  // const bdstChgModal = (chgBuilding: chgBuilding[]) => {
+  //   setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding });
+  // };
   useEffect(() => {
     getHtdflBdstData(pageNation, "0");
   }, [pageNation]);
@@ -103,14 +100,18 @@ export default function Home() {
                 />
               </SearchFormLeft>
               <SearchFormRight>
-              <div className="flex flex-row space-x-2 items-center">
-                <Button size={"sm"} onClick={()=>{initHtdfl(searchTxt||"")}}>조회</Button>
-                <Button
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
                     size={"sm"}
-                  onClick={() => setIsNewReg(!issNewReg)}
-                >
-                  신규등록
-                </Button>
+                    onClick={() => {
+                      initHtdfl(searchTxt || "");
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button size={"sm"} onClick={() => setIsNewReg(!issNewReg)}>
+                    신규등록
+                  </Button>
                 </div>
               </SearchFormRight>
             </SearchDiv>
@@ -126,41 +127,49 @@ export default function Home() {
                 pageSize={100}
                 total={10}
                 headName={"건축물 목록"}
-                cellClick={(val, headId) => { cellClick(val || undefined, headId); } } 
+                cellClick={(val, headId) => {
+                  cellClick(val || undefined, headId);
+                }}
                 onPageChange={setPageNation}
-                >
-              </UiTable>
+              ></UiTable>
             </ListDiv>
           </div>
           <div className="col-span-2 max-h-full">
-          <ListDiv>
-            <ScrollArea className="h-[60vh]">
-              <HtdflRegForm
-                htdflForm={htdflForm ?? ({} as customHtdflBdst)}
-                isModal={false}
-              />
-            </ScrollArea>
+            <ListDiv>
+              <ScrollArea className="h-[60vh]">
+                <HtdflRegForm
+                  htdflForm={htdflForm ?? ({} as customHtdflBdst)}
+                  isModal={false}
+                />
+              </ScrollArea>
             </ListDiv>
           </div>
         </div>
-         <UiModal
-            body={<BdstReg moType="HTB"></BdstReg>}
-            bodyClass="w-[68vw] max-w-none h-[90vh]"
-            open={issNewReg}
-            onOpenChange={(open) => {
-              setIsNewReg(open);
-            }}
-          />
-               
-          <UiModal
+        <UiModal
+          body={
+            <BdstReg
+              moType="HTB"
+              isModal={false}
+              setIsModal={setIsNewReg}
+            ></BdstReg>
+          }
+          bodyClass="w-[68vw] max-w-none h-[90vh]"
+          open={issNewReg}
+          onOpenChange={(open) => {
+            setIsNewReg(open);
+          }}
+        />
+
+        {/* <UiModal
           bodyClass={""}
           open={bdstChgProps.isOpen}
-          body={<BdstChgModal   chgBuilding={bdstChgProps.chgBuilding}></BdstChgModal>}
+          body={
+            <BdstChgModal chgBuilding={bdstChgProps.chgBuilding}></BdstChgModal>
+          }
           onOpenChange={(open) => {
             setBdstChgProps({ ...bdstChgProps, isOpen: open });
-          }
-          }
-        />
+          }}
+        /> */}
       </ContentsDiv>
     </>
   );
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
index d57c730ce..ea0dea649 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
@@ -151,7 +151,7 @@ export default function Home() {
         </div>
 
         <UiModal
-          body={<BdstReg moType="RST" setIsModal={setIsNewReg}></BdstReg>}
+          body={<BdstReg moType="RST" setIsModal={setIsNewReg} isModal={issNewReg}></BdstReg>}
           bodyClass="w-[68vw] max-w-none h-[90vh]"
           open={issNewReg}
           onOpenChange={(open) => {
diff --git a/apps/wr/app/store/common/code/basicCode.tsx b/apps/wr/app/store/common/code/basicCode.tsx
new file mode 100644
index 000000000..56c59b502
--- /dev/null
+++ b/apps/wr/app/store/common/code/basicCode.tsx
@@ -0,0 +1,204 @@
+import type { SelectDataType } from "@common/business_components";
+
+export const yn: SelectDataType[] = [
+  { val: "Y", text: "Y" },
+  { val: "N", text: "N" },
+];
+export const bdstFilterYn: SelectDataType[] = [
+  { val: "Y", text: "Y" },
+  { val: "N", text: "N" },
+  { val: "D", text: "확인불가" },
+  { val: "F", text: "미가동" },
+];
+// 최우수(그린1)/우수(그린2), 우량(그린3), 일반(그린4),  확인불가 체크
+export const bdstGrntchClass: SelectDataType[] = [
+  { val: "최우수(그린1)", text: "최우수(그린1)" },
+  { val: "우수(그린2)", text: "우수(그린2)" },
+  { val: "우량(그린3)", text: "우량(그린3)" },
+  { val: "일반(그린4)", text: "일반(그린4)" },
+  { val: "확인불가", text: "확인불가" },
+];
+export const bdstIncenYn: SelectDataType[] = [
+  { val: "Y", text: "Y" },
+  { val: "N", text: "N" },
+  { val: "D", text: "확인불가" },
+];
+//처리장연계/자체+연계/자체처리
+export const erctUswtrPrcsMeth: SelectDataType[] = [
+  { val: "처리장연계", text: "처리장연계" },
+  { val: "자체+연계", text: "자체+연계" },
+  { val: "자체처리", text: "자체처리" },
+];
+
+export const rusePrcsMthdCd: SelectDataType[] = [
+  { val: "물리학적처리", text: "물리학적처리" },
+  { val: "생물학적처리", text: "생물학적처리" },
+];
+
+export const ruseSeCd: SelectDataType[] = [
+  { val: "신규", text: "신규" },
+  { val: "증설", text: "증설" },
+  { val: "관로", text: "관로" },
+  { val: "감량", text: "감량" },
+  { val: "개량", text: "개량" },
+];
+
+export const ruseBizMthdCd: SelectDataType[] = [
+  { val: "재정", text: "재정" },
+  { val: "민간투자", text: "민간투자" },
+  { val: "자체", text: "자체" },
+];
+
+//공통 건축물 용도
+export const bdstUsgCd: SelectDataType[] = [
+  { val: "-1", text: "확인불가" },
+  { val: "1", text: "운동장" },
+  { val: "2", text: "체육관" },
+  { val: "3", text: "공공업무시설" },
+  { val: "4", text: "공공기관의청사" },
+  { val: "5", text: "아파트" },
+  { val: "6", text: "연립주택" },
+  { val: "7", text: "다세대주택" },
+  { val: "8", text: "기숙사" },
+  { val: "9", text: "초등학교" },
+  { val: "10", text: "중학교" },
+  { val: "11", text: "고등학교" },
+  { val: "12", text: "전문대학" },
+  { val: "13", text: "대학및대학교" },
+  { val: "14", text: "골프장" },
+  { val: "15", text: "대규모점포" },
+  { val: "16", text: "기타" },
+];
+
+export const rswtBdstType: SelectDataType[] = [
+  { text: "숙박업", val: "17" },
+  { text: "목욕장업", val: "18" },
+  { text: "공장", val: "19" },
+  { text: "발전시설", val: "20" },
+  { text: "관광단지개발사업", val: "21" },
+  { text: "도시개발사업", val: "22" },
+  { text: "산업단지개발사업", val: "23" },
+  { text: "택지개발사업", val: "24" },
+  { text: "대규모점포(대형마트)", val: "25" },
+  { text: "대규모점포(전문점)", val: "26" },
+  { text: "대규모점포(백화점)", val: "27" },
+  { text: "대규모점포(쇼핑센터)", val: "28" },
+  { text: "대규모점포(복합쇼핑몰)", val: "29" },
+  { text: "물류시설", val: "30" },
+  { text: "운수시설(여객자동차터미널)", val: "31" },
+  { text: "운수시설(철도시설)", val: "32" },
+  { text: "운수시설(공항시설)", val: "33" },
+  { text: "운수시설(항만시설)", val: "34" },
+  { text: "업무시설(공공업무시설)", val: "35" },
+  { text: "업무시설(금융업소)", val: "36" },
+  { text: "업무시설(사무소)", val: "37" },
+  { text: "업무시설(결혼상담소 등 소개업소)", val: "38" },
+  { text: "업무시설(출판사)", val: "39" },
+  { text: "업무시설(신문사)", val: "40" },
+  { text: "업무시설(오피스텔)", val: "41" },
+  { text: "교정시설", val: "42" },
+  { text: "방송국", val: "43" },
+  { text: "전신전화국", val: "44" },
+  { text: "기타", val: "45" },
+];
+
+export const orgwtKndCd = [
+  { text: "오수(변기 오수 제외)", val: "1" },
+  { text: "오수", val: "2" },
+  { text: "폐수", val: "3" },
+  { text: "오수 및 폐수", val: "4" },
+  { text: "기타", val: "5" },
+];
+
+export const chBuCd = [
+  { val: "증축", text: "증축" },
+  { val: "개축", text: "개축" },
+  { val: "재축", text: "재축" },
+];
+
+export const dmdUszCd = [
+  { val: "조경용수", text: "조경용수" },
+  { val: "청소화장실용수", text: "청소화장실용수" },
+  { val: "농업용수", text: "농업용수" },
+  { val: "공업용수", text: "공업용수" },
+  { val: "친수용수", text: "친수용수" },
+  { val: "기타", text: "기타" },
+];
+
+export const ruseMngMtd = [
+  { val: "자체운영", text: "자체운영" },
+  { val: "공기업", text: "공기업" },
+  { val: "민간(대행)", text: "민간(대행)" },
+];
+
+export const pplQulity = [
+  { val: "도복장강관", text: "도복장강관" },
+  { val: "PE관", text: "PE관" },
+  { val: "스테인레스관", text: "스테인레스관" },
+  { val: "덕타일주철관", text: "덕타일주철관" },
+  { val: "유리섬유복합관", text: "유리섬유복합관" },
+  { val: "기타", text: "기타" },
+];
+export const pplLenght = [
+  { val: "D100", text: "D100" },
+  { val: "D200", text: "D200" },
+  { val: "D250", text: "D250" },
+  { val: "D300", text: "D300" },
+  { val: "D350", text: "D350" },
+  { val: "D400", text: "D400" },
+  { val: "D450", text: "D450" },
+  { val: "D500", text: "D500" },
+  { val: "D700", text: "D700" },
+  { val: "D900", text: "D900" },
+  { val: "D1000​", text: "D1000​" },
+];
+
+export const rainFcltCd = [
+  { val: "지붕", text: "지붕" },
+  { val: "건물옥상", text: "건물옥상" },
+  { val: "골프장 연못", text: "골프장 연못" },
+  { val: "운동장 바닥", text: "운동장 바닥" },
+  { val: "운동장 지붕", text: "운동장 지붕" },
+  { val: "주차장", text: "주차장" },
+  { val: "태양광패널", text: "태양광패널" },
+  { val: "연못", text: "연못" },
+  { val: "기타", text: "기타" },
+  { val: "확인불가", text: "확인불가" },
+];
+
+//물리화학적처리(스크린, 응집, 침전)/생물학적처리(활성슬러지법 등)/소독(염소, UV 등)/기타
+export const rswtPrscCdMthdCd = [
+  {
+    val: "물리화학적처리(스크린,응집,침전)",
+    text: "물리화학적처리(스크린,응집,침전)",
+  },
+  {
+    val: "생물학적처리(활성슬러지법 등)",
+    text: "생물학적처리(활성슬러지법 등)",
+  },
+  { val: "소독(염소, UV 등)", text: "소독(염소, UV 등)" },
+  { val: "기타", text: "기타" },
+];
+
+export const htdPowerMthdCd= [
+  {
+    val: "석탄화력발전",
+    text: "석탄화력발전",
+  },
+];
+
+//(공업용수/양식장/농업용수)
+export const htdUtztnUsgCd= [
+  {
+    val: "공업용수",
+    text: "공업용수",
+  },
+  {
+    val: "양식장",
+    text: "양식장",
+  },
+  {
+    val: "농업용수",
+    text: "농업용수",
+  },
+];
diff --git a/apps/wr/app/store/common/code/index.ts b/apps/wr/app/store/common/code/index.ts
index 17ea1f2e7..b3cf48603 100644
--- a/apps/wr/app/store/common/code/index.ts
+++ b/apps/wr/app/store/common/code/index.ts
@@ -1,236 +1,13 @@
 import { getFetch } from "@/components/lib/api";
 import type { EnvPartSelectDataType, SelectDataType } from "@common/business_components/ui";
-
-
-
+import { bdstFilterYn, bdstGrntchClass, bdstIncenYn, bdstUsgCd, chBuCd, dmdUszCd, erctUswtrPrcsMeth, htdPowerMthdCd, htdUtztnUsgCd, orgwtKndCd, pplLenght, pplQulity, rainFcltCd, rswtPrscCdMthdCd, ruseBizMthdCd, ruseMngMtd, rusePrcsMthdCd, ruseSeCd, yn } from "./basicCode";
 export const btnClass = "p-4 m-2 text-white rounded-sm text-lg font-medium "
 
-const yn: SelectDataType[] = [
-  { val: 'Y', text: 'Y' },
-  { val: 'N', text: 'N' },
-]
-const bdstFilterYn: SelectDataType[] = [
-  { val: 'Y', text: 'Y' },
-  { val: 'N', text: 'N' },
-  { val: 'D', text: '확인불가' },
-  { val: 'F', text: '미가동' },
-]
-// 최우수(그린1)/우수(그린2), 우량(그린3), 일반(그린4),  확인불가 체크
-const bdstGrntchClass: SelectDataType[] = [
-  { val: '최우수(그린1)', text: '최우수(그린1)' },
-  { val: '우수(그린2)', text: '우수(그린2)' },
-  { val: '우량(그린3)', text: '우량(그린3)' },
-  { val: '일반(그린4)', text: '일반(그린4)' },
-  { val: '확인불가', text: '확인불가' },
-
-]
-const bdstIncenYn: SelectDataType[] = [
-  { val: 'Y', text: 'Y' },
-  { val: 'N', text: 'N' },
-  { val: 'D', text: '확인불가' },
-]
-//처리장연계/자체+연계/자체처리
-const erctUswtrPrcsMeth : SelectDataType[]= [
-  { val: '처리장연계', text: '처리장연계' },
-  { val: '자체+연계', text: '자체+연계' },
-  { val: '자체처리', text: '자체처리' },
-]
-
-const rusePrcsMthdCd : SelectDataType[] = [
-  { val: '물리학적처리', text: '물리학적처리' },
-  { val: '생물학적처리', text: '생물학적처리' },
-]
-
-const ruseSeCd :  SelectDataType[] = [
-  { val: '신규', text: '신규' },
-  { val: '증설', text: '증설' },
-  { val: '관로', text: '관로' },
-  { val: '감량', text: '감량' },
-  { val: '개량', text: '개량' },
-]
-
-const ruseBizMthdCd:  SelectDataType[] = [
-  { val: '재정', text: '재정' },
-  { val: '민간투자', text: '민간투자' }, 
-  { val: '자체', text: '자체' }, 
-]
-
-//공통 건축물 용도
-const bdstUsgCd: SelectDataType[] = [
-  { val: '-1', text: "확인불가" },
-  { val: '1', text: "운동장" },
-  { val: '2', text: "체육관" },
-  { val: '3', text: "공공업무시설" },
-  { val: '4', text: "공공기관의청사" },
-  { val: '5', text: "아파트" },
-  { val: '6', text: "연립주택" },
-  { val: '7', text: "다세대주택" },
-  { val: '8', text: "기숙사" },
-  { val: '9', text: "초등학교" },
-  { val: '10', text: "중학교" },
-  { val: '11', text: "고등학교" },
-  { val: '12', text: "전문대학" },
-  { val: '13', text: "대학및대학교" },
-  { val: '14', text: "골프장" },
-  { val: '15', text: "대규모점포" },
-  { val: '16', text: "기타" },
-];
-//빗물 집수면 종류 용도
-// const rainFcltCd = [
-//   { val: "1", text: "지붕" },
-//   { val: "2", text: "건물옥상" },
-//   { val: "3", text: "골프장 연못" },
-//   { val: "4", text: "운동장 바닥" },
-//   { val: "5", text: "운동장 지붕" },
-//   { val: "6", text: "주차장" },
-//   { val: "7", text: "태양광패널" },
-//   { val: "8", text: "연못" },
-//   { val: "9", text: "기타" },
-//   { val: "10", text: "확인불가" },
-// ];
-// 중수도 필수 원수종류
-const rswtBdstType: SelectDataType[] = [
-  { text: "숙박업", val: "17" },
-  { text: "목욕장업", val: "18" },
-  { text: "공장", val: "19" },
-  { text: "발전시설", val: "20" },
-  { text: "관광단지개발사업", val: "21" },
-  { text: "도시개발사업", val: "22" },
-  { text: "산업단지개발사업", val: "23" },
-  { text: "택지개발사업", val: "24" },
-  { text: "대규모점포(대형마트)", val: "25" },
-  { text: "대규모점포(전문점)", val: "26" },
-  { text: "대규모점포(백화점)", val: "27" },
-  { text: "대규모점포(쇼핑센터)", val: "28" },
-  { text: "대규모점포(복합쇼핑몰)", val: "29" },
-  { text: "물류시설", val: "30" },
-  { text: "운수시설(여객자동차터미널)", val: "31" },
-  { text: "운수시설(철도시설)", val: "32" },
-  { text: "운수시설(공항시설)", val: "33" },
-  { text: "운수시설(항만시설)", val: "34" },
-  { text: "업무시설(공공업무시설)", val: "35" },
-  { text: "업무시설(금융업소)", val: "36" },
-  { text: "업무시설(사무소)", val: "37" },
-  { text: "업무시설(결혼상담소 등 소개업소)", val: "38" },
-  { text: "업무시설(출판사)", val: "39" },
-  { text: "업무시설(신문사)", val: "40" },
-  { text: "업무시설(오피스텔)", val: "41" },
-  { text: "교정시설", val: "42" },
-  { text: "방송국", val: "43" },
-  { text: "전신전화국", val: "44" },
-  { text: "기타", val: "45" }
-];
-
-const orgwtKndCd = [
-  { text: "오수(변기 오수 제외)", val: "1" },
-  { text: "오수", val: "2" },
-  { text: "폐수", val: "3" },
-  { text: "오수 및 폐수", val: "4" },
-  { text: "기타", val: "5" },
-];
-
-const chBuCd = [
-  { val: "증축", text: "증축" },
-  { val: "개축", text: "개축" },
-  { val: "재축", text: "재축" },
-]
-
-
-
-const dmdUszCd = [
-  { val: "조경용수", text: "조경용수" },
-  { val: "청소화장실용수", text: "청소화장실용수" },
-  { val: "농업용수", text: "농업용수" },
-  { val: "공업용수", text: "공업용수" },
-  { val: "친수용수", text: "친수용수" },
-  { val: "기타", text: "기타" },
-
-]
-
-const ruseMngMtd = [
-  { val: "자체운영", text: "자체운영" },
-  { val: "공기업", text: "공기업" },
-  { val: "민간(대행)", text: "민간(대행)" },
-]
-
-
-const pplQulity = [
-  { val: "도복장강관", text: "도복장강관" },
-  { val: "PE관", text: "PE관" },
-  { val: "스테인레스관", text: "스테인레스관" },
-  { val: "덕타일주철관", text: "덕타일주철관" },
-  { val: "유리섬유복합관", text: "유리섬유복합관" },
-  { val: "기타", text: "기타" },
-
-]
-const pplLenght = [
-  { val: "D100", text: "D100" },
-  { val: "D200", text: "D200" },
-  { val: "D250", text: "D250" },
-  { val: "D300", text: "D300" },
-  { val: "D350", text: "D350" },
-  { val: "D400", text: "D400" },
-  { val: "D450", text: "D450" },
-  { val: "D500", text: "D500" },
-  { val: "D700", text: "D700" },
-  { val: "D900", text: "D900" },
-  { val: "D1000​", text: "D1000​" },
-
-]
 export const buildingType = {
   RST:"RST",
   RNB:"RNB",
   HTB:"HTB"
 }
-
-const rainFcltCd = [
-  { val: "지붕", text: "지붕" },
-  { val: "건물옥상", text: "건물옥상" },
-  { val: "골프장 연못", text: "골프장 연못" },
-  { val: "운동장 바닥", text: "운동장 바닥" },
-  { val: "운동장 지붕", text: "운동장 지붕" },
-  { val: "주차장", text: "주차장" },
-  { val: "태양광패널", text: "태양광패널" },
-  { val: "연못", text: "연못" },
-  { val: "기타", text: "기타" },
-  { val: "확인불가", text: "확인불가" },
-];
-
-export type comCodeState = {
-  code: {
-    isInit: boolean;
-    chBuCd: SelectDataType[]
-    rainFcltCd: SelectDataType[];
-    bdstUsgCd: SelectDataType[];
-    cityCd: SelectDataType[];
-    sggCd: SelectDataType[];
-    rvbsnCd: SelectDataType[];
-    mdmbsnCd: SelectDataType[];
-    lgbsnCd: SelectDataType[];
-    lclgvrnmntCd: EnvPartSelectDataType[];
-    orgwtKndCd: SelectDataType[];
-    yn: SelectDataType[];
-    pplQulity: SelectDataType[];
-    pplLenght: SelectDataType[];
-    dmdUszCd:SelectDataType[]
-    buildingType: {
-      RST:string,
-      RNB:string,
-      HTB:string
-    }
-    ruseMngMtd:SelectDataType[]
-    ruseSeCd: SelectDataType[];
-    ruseBizMthdCd: SelectDataType[];
-    rusePrcsMthdCd: SelectDataType[];
-    erctUswtrPrcsMeth: SelectDataType[];
-    bdstFilterYn: SelectDataType[];
-    bdstIncenYn: SelectDataType[];
-    bdstGrntchClass:SelectDataType[];
-  };
-};
-
-export type comCodeType = comCodeState & comCodeActions;
-
 export const getSggCd = async (set: any) => {
   const sgg = await getFetch("common", "/addr/sgg");
   /* const sggCd = sgg.map((item: any) => ({
@@ -356,6 +133,47 @@ export const getEnvPartCd = async (set: any) => {
 
 
 
+
+export type comCodeState = {
+  code: {
+    isInit: boolean;
+    chBuCd: SelectDataType[]
+    rainFcltCd: SelectDataType[];
+    bdstUsgCd: SelectDataType[];
+    cityCd: SelectDataType[];
+    sggCd: SelectDataType[];
+    rvbsnCd: SelectDataType[];
+    mdmbsnCd: SelectDataType[];
+    lgbsnCd: SelectDataType[];
+    lclgvrnmntCd: EnvPartSelectDataType[];
+    orgwtKndCd: SelectDataType[];
+    yn: SelectDataType[];
+    pplQulity: SelectDataType[];
+    pplLenght: SelectDataType[];
+    dmdUszCd:SelectDataType[]
+    buildingType: {
+      RST:string,
+      RNB:string,
+      HTB:string
+    }
+    ruseMngMtd:SelectDataType[]
+    ruseSeCd: SelectDataType[];
+    ruseBizMthdCd: SelectDataType[];
+    rusePrcsMthdCd: SelectDataType[];
+    erctUswtrPrcsMeth: SelectDataType[];
+    bdstFilterYn: SelectDataType[];
+    bdstIncenYn: SelectDataType[];
+    bdstGrntchClass:SelectDataType[];
+    rswtPrscCdMthdCd:SelectDataType[];
+    htdPowerMthdCd:SelectDataType[]
+    htdUtztnUsgCd:SelectDataType[]
+  };
+};
+
+export type comCodeType = comCodeState & comCodeActions;
+
+
+
 export const comCodeStateExport: comCodeState = {
   code: {
     isInit: false,
@@ -381,7 +199,10 @@ export const comCodeStateExport: comCodeState = {
     erctUswtrPrcsMeth:erctUswtrPrcsMeth,
     bdstFilterYn:bdstFilterYn,
     bdstIncenYn:bdstIncenYn,
-    bdstGrntchClass:bdstGrntchClass
+    bdstGrntchClass:bdstGrntchClass,
+    rswtPrscCdMthdCd:rswtPrscCdMthdCd,
+    htdPowerMthdCd:htdPowerMthdCd,
+    htdUtztnUsgCd:htdUtztnUsgCd,
   },
 };
 
@@ -389,9 +210,6 @@ export type comCodeActions = {
   codeInit: () => void;
 };
 
-
-
-
 export const codeActionExport: (set: any) => comCodeActions = (set: any) => {
   return {
     codeInit: async () => {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx
index 931cd1305..418f4b45f 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/bdstReg/index.tsx
@@ -79,8 +79,9 @@ const  isRswtBdst = (data: any): data is customRswtBdst =>{
     data.reuseBuilding=chData;
   }
 
-  if(data?.chgBuilding.length>0){
-    const  chRgtr = data.chgBuilding.map((item) =>({...item, rgtr:TEST_UUID, mdfr: item.mdfr ?? null })) 
+
+  if('chgBuilding' in data && Array.isArray(data.chgBuilding) && data.chgBuilding.length > 0){   
+     const  chRgtr = data.chgBuilding.map((item) =>({...item, rgtr:TEST_UUID, mdfr: item.mdfr ?? null })) 
     data.chgBuilding =chRgtr;
   }
     return data;
@@ -127,7 +128,7 @@ const  isRswtBdst = (data: any): data is customRswtBdst =>{
       data.reuseBuilding=chData;
     }
 
-    if(data?.chgBuilding.length>0){
+    if('chgBuilding' in data && Array.isArray(data.chgBuilding) && data.chgBuilding.length > 0){
       const  chMdfr = data.chgBuilding.map((item) =>({...item, mdfr:TEST_UUID, archChgArea: item.archChgArea ?? '' })) 
       data.chgBuilding =chMdfr;
     }
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx
new file mode 100644
index 000000000..da1fa6f09
--- /dev/null
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/headList.tsx
@@ -0,0 +1,10 @@
+import type { TableUpperProps } from "@/app/store/common/type/header";
+
+export const htdTableHeadList: TableUpperProps[] = [
+  { id: "cityText", title: "시도" },
+  { id: "sggText", title: "시군구" },
+  { id: "bdstNm", title: "발전소명" },
+  { id: "daddr", title: "위치" },
+  { id: "frstArchPrmsnDt", title: "준공년도" },
+  { id: "archArea", title: "건축면적" },
+];
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
index 314d5762b..f2875e232 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
@@ -6,9 +6,12 @@ import { makeMdfr, makeRstr } from "../bdstReg";
 import {
   baseReuseBuildingSchema,
   chgBuildingSchema,
+  htdflReuseBuildingSchema,
   validationMessages,
 } from "../rainReg/type"; // Import baseReuseBuildingSchema, chgBuildingSchema, validationMessages
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import { htdTableHeadList } from "./headList";
+import toast from "react-hot-toast";
 
 const hdtflObjSchema = z.object({
   htdflFcltPk: z.number().nullish(),
@@ -21,8 +24,8 @@ const hdtflObjSchema = z.object({
     .positive({ message: validationMessages.required("시설 용량") }),
   plwtYn: z.enum(["Y", "N"]).default("Y"),
   orgwtWtritSpt: z
-    .number()
-    .positive({ message: validationMessages.required("원수 취수량") }),
+    .string()
+    .min(1, { message: validationMessages.required("원수 취수 지점") }),
   orgwtOcrnProcs: z
     .string()
     .min(1, { message: validationMessages.required("원수 발생 공정") }),
@@ -53,7 +56,9 @@ const hdtflObjSchema = z.object({
   ph: z.number().default(0), // Measurements, 0 is fine as default
   clIonQnt: z.number().default(0), // Measurements, 0 is fine as default
   cdtnv: z.number().default(0), // Measurements, 0 is fine as default
-  emsnExitTp: z.number().default(0), // Measurements, 0 is fine as default
+  emsnExitTp: z.number()
+  .max(100, { message: "온도는 100이상이 될 수 없습니다." })
+  .default(0), // Changed max to 100 based on message, // Measurements, 0 is fine as default
   rgtr: z.string().nullish().default(null),
   mdfr: z.string().nullish().default(null),
 });
@@ -77,16 +82,15 @@ export const hdtflZod = z.object({
   mdfr: z.string().nullish().default(null),
   reuseBuilding: z
     .array(
-      baseReuseBuildingSchema.extend({
+      htdflReuseBuildingSchema.extend({
         htdflObj: hdtflObjSchema,
       })
     )
     .default([]),
-  chgBuilding: z.array(chgBuildingSchema).default([]), // Use imported chgBuildingSchema
+    //온배수는 건축물은 등록 하는것이 다름
+ // chgBuilding: z.array(chgBuildingSchema).nullish(), // Use imported chgBuildingSchema
 });
-
 export type customHtdflBdst = z.infer<typeof hdtflZod>;
-
 export type htdflFacState = {
   htdfl: {
     isInit: boolean;
@@ -104,18 +108,16 @@ type htdflFacSActions = {
 const htdflRes: customHtdflBdst[] = [];
 
 export type htdflFacType = htdflFacState & htdflFacSActions;
-
 export const htdflFacStateExport: htdflFacState = {
   htdfl: {
     isInit: false,
-    upHeadList: upHeadList,
+    upHeadList: htdTableHeadList,
     htdflRes: htdflRes,
   },
 };
 
 const initFetch = async (code: string | number) => {
-  const rswtRes = await getFetch("wr", `/facilityList/1/20/${code}`);
-
+  const rswtRes = await getFetch("wr", `/drain/facilityList/1/20/${code}`);
   return rswtRes;
 };
 export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
@@ -128,8 +130,6 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
           "wr",
           `/drain/facilityList/${pageNation}/20/${code}`
         );
-        console.log(pageNation);
-        // 여기서 상태 업데이트
         return set((state: htdflFacState) => ({
           ...state,
           htdfl: {
@@ -142,7 +142,6 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         console.log(e);
       }
     },
-
     initHtdfl: async (code: string) => {
       try {
         const htdflRes = await initFetch(code);
@@ -162,10 +161,15 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
     },
     htdflBdstUpdate: async (data: customHtdflBdst, code: string | number) => {
       try {
+
+        console.log('data ', data)
+
         const chData = await makeMdfr(data);
-        const res = await putFectch("/drain/facility", data);
+        console.log('chData ', chData)
+
+        const res = await putFectch("/drain/facility", chData);
         if (res.ok) {
-          alert(" 수정이 완료되었습니다.");
+          toast.success("온배수 건축물 수정이 완료되었습니다.");
         }
 
         const htdflRes = await initFetch(code);
@@ -178,40 +182,18 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
           },
         }));
       } catch (errorUpdate) {
-        alert(
-          "업데이트 오류입니다. " +
-            (errorUpdate instanceof Error ? errorUpdate.message : "")
-        );
+        toast.error("온배수 건축물 수정 오류입니다..");
       }
     },
     htdflBdstReg: async (data: customHtdflBdst, code: string | number) => {
       try {
-        const chData = await makeRstr(data);
-        const res = await postFectch("/drain/facility", data);
-        if (res.ok) {
-          if (data.chgBuilding.length > 0) {
-            await res
-              .json()
-              .then((resData: any) => {
-                const chPK = resData?.data?.bdstInfoPk;
-
-                const makeCh = resData.data.chgBuilding.map(
-                  (item: chgBuilding) => ({
-                    ...item,
-                    bdstInfoFk: chPK,
-                  })
-                );
-                const chch = postFectch("/reuseFc/chgBuilding", makeCh);
-                return chch;
-              })
-              .then((chch: any) => {
-                if (chch.ok) {
-                  alert("등록이 완료되었습니다.");
-                }
-              });
-          } else {
-            alert("등록이 완료되었습니다.");
-          }
+        // data는 단일 객체이므로 .map을 사용할 수 없습니다.
+        // 등록 시에는 건축물 변경 이력이 없으므로 chgBuilding을 빈 배열로 설정하고,
+        // API가 배열을 기대하므로 단일 객체를 배열로 감싸줍니다.
+        const chData = makeRstr(data);
+        const res = await postFectch("/drain/facility", chData);
+        if (res.status ===200) {
+            toast.success("온배수 건축물 등록이 완료되었습니다.");
         }
         const htdflRes = await initFetch(code);
         set((state: htdflFacState) => ({
@@ -223,8 +205,9 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
           },
         }));
       } catch (errorReg) {
-        alert("등록 오류입니다.");
+        toast.error("온배수 건축물 등록 오류입니다..");
+
       }
-    },
+    }
   };
 };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
index 59d6633a2..2d17b4601 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
@@ -25,8 +25,7 @@ export const baseReuseBuildingSchema = z.object({
     {
       message: validationMessages.yearFormat,
     }
-  )
-  .nullish(),
+  ),
   grntchBdstCertNo: z.string().default(""),
   grntchBdstCertGrd: z.string().default(""),
   crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
@@ -52,3 +51,40 @@ export const chgBuildingSchema = z.object({
   rgtr:z.string().nullish(),
   mdfr:z.string().nullish(),
 });
+
+
+
+export const htdflReuseBuildingSchema = z.object({
+  bdstRuseFcltPk: z.number().nullish(),
+  bdstInfoFk: z.number().nullish(),
+  instlCmptnDt: z.coerce.date().default(() => new Date()),
+  instlCst: z.number().nullish(),
+  operMngCd: z.string().optional().nullish(),
+  anlOperCst: z.number().default(0),
+  instlCstSprtYn: z.string().default("Y"),
+  instlCstSprtAmt: z.number().nullish(),
+  grntchBdstCertYn: z.string().default("Y"),
+  grntchBdstCertYr: z
+  .string()
+  .max(4, { message: validationMessages.yearFormat })
+  .refine(
+    (year) => year.length === 0 || /^\d{4}$/.test(year),
+    {
+      message: validationMessages.yearFormat,
+    }
+  )
+  .nullish(),
+  grntchBdstCertNo: z.string().default(""),
+  grntchBdstCertGrd: z.string().default(""),
+  crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
+  crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
+  crgRdctAmt: z.number().default(0), // 안쓰는 값
+  ruseFcltFlg: z.string().default(""),
+  bdstUsgCd: z.number().default(0).nullish(),
+  lawTrgtYn: z.string().default("Y").nullish(),
+  rgtr: z.string().nullish(),
+  mdfr: z.string().nullish(),
+});
+
+
+
diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
index c1bf7e2ca..8ae9ad4dd 100644
--- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
+++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
@@ -16,10 +16,10 @@ import {
   type SelectDataType,
 } from "@common/business_components";
 import { Button, Checkbox, Input } from "@common/components";
-import { useEffect,  useState } from "react";
+import { useEffect, useState } from "react";
 import { useFieldArray } from "react-hook-form";
 
-export default function BdstReg({ form }: { form: any }) {
+export default function BdstReg({ form, type }: { form: any; type?: string }) {
   const { code } = useWrStore((state) => {
     return state;
   });
@@ -37,16 +37,15 @@ export default function BdstReg({ form }: { form: any }) {
     });
   };
   const removeSelected = () => {
-  const idxsToRemove = fields
-    .map((item, idx) => selectedIds.includes(item.id) ? idx : -1)
-    .filter(index => index > -1)
-    .sort((prevIndex, nextIndex) => nextIndex - prevIndex);
+    const idxsToRemove = fields
+      .map((item, idx) => (selectedIds.includes(item.id) ? idx : -1))
+      .filter((index) => index > -1)
+      .sort((prevIndex, nextIndex) => nextIndex - prevIndex);
 
     remove(idxsToRemove);
     setSelectedIds([]);
   };
 
-
   const [selectSgg, setSelectSgg] = useState<SelectDataType[] | undefined>();
   const [objSearch, setObjSearch] = useState<objSearchType>({
     sgg: "",
@@ -83,18 +82,14 @@ export default function BdstReg({ form }: { form: any }) {
   const [selectedIds, setSelectedIds] = useState<string[]>([]);
 
   const toggleSelect = (id: string) => {
-    setSelectedIds(prev =>
-      prev.includes(id)
-        ? prev.filter(x => x !== id)
-        : [...prev, id]
+    setSelectedIds((prev) =>
+      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
     );
   };
 
   return (
     <>
-      <h1 className={formH1Class}>
-        건축물 기본 정보
-      </h1>
+      <h1 className={formH1Class}>건축물 기본 정보</h1>
       <div className="grid grid-cols-6 gap-2 mt-4">
         <div className="col-span-3">
           <FormField
@@ -172,26 +167,7 @@ export default function BdstReg({ form }: { form: any }) {
             )}
           />
         </div>
-        <div className="col-span-2">
-          <FormField
-            control={form.control}
-            name="reuseBuilding.0.bdstUsgCd"
-            render={({ field }) => (
-              <FormUi label="건축물용도">
-                <SelectBox
-                  className={""}
-                  selectClass={selectClass}
-                  label={""}
-                  selectArray={code.bdstUsgCd}
-                  onSelectValue={(val) => {
-                    field.onChange(Number(val));
-                  }}
-                  value={field.value??code.bdstUsgCd[0]?.val}
-                />
-              </FormUi>
-            )}
-          />
-        </div>
+
         <div className="col-span-2">
           <FormField
             control={form.control}
@@ -201,133 +177,166 @@ export default function BdstReg({ form }: { form: any }) {
                 <DatePicker
                   mode={"single"}
                   field={{
-                    value: field.value?? new Date(),
+                    value: field.value ?? new Date(),
                     onChange: (date: Date | undefined) => field.onChange(date),
                   }}
-                  selectClass={'w-full'}
+                  selectClass={"w-full"}
                 ></DatePicker>
               </FormUi>
             )}
           />
         </div>
-        <div className="col-span-2">
-          <FormField
-            control={form.control}
-            name="archArea"
-            render={({ field }) => (
-              <FormUi label="건축면적(m³)">
-                <Input
-                  className={selectClass}
-                  placeholder="면적을 입력하세요"
-                  type="text"
-                  onChange={(e) => {
-                    handleCommaNumberChange(e, field.onChange);
-                  }}
-                  value={formatCommaNumber(field.value)}
-                />
-              </FormUi>
-            )}
-          />
-        </div>
-        <div className="col-span-2">
-          <FormField
-            control={form.control}
-            name="reuseBuilding.0.lawTrgtYn"
-            render={({ field }) => (
-              <FormUi label="법정의무대상여부">
-                <SelectBox
-                  className={""}
-                  selectClass={selectClass}
-                  label={""}
-                  selectArray={code.yn}
-                  onSelectValue={(val) => {
-                    field.onChange(val);
-                  }}
-                  value={field.value??code.yn[0]?.val }
-                />
-              </FormUi>
-            )}
-          />
-        </div>
       </div>
-      <h1 className={formH1Class}>
-        중축, 개축, 재축
-      </h1>
 
-      <div className="flex justify-end gap-2 mt-4">
-        <Button type="button" className="" size={"sm"} onClick={plusHist}>
-          이력추가
-        </Button>
-        <Button
-          type="button"
-          className="!bg-red-500 text-white"
-          size={"sm"}
-          onClick={removeSelected}
-        >
-          삭제
-        </Button>
-      </div>
-      {fields.map((field, index) => (
-        <div key={field.id} className="grid grid-cols-[auto,1fr,1fr,1fr] gap-2 mt-4 items-center">
-        <div className="col-span-1 flex justify-center mr-4">
-          <Checkbox
-            checked={selectedIds.includes(field.id)}
-            onCheckedChange={() => toggleSelect(field.id)}
-          />
-        </div>
-        <div className="">
-          <FormField
-            control={form.control}
-            name={`chgBuilding.${index}.bdstChgNm`}
-            render={({ field: f }) => (
-              <FormUi label="구분">
-                <SelectBox
-                  selectClass={selectClass}
-                  selectArray={code.chBuCd}
-                  onSelectValue={val => f.onChange(val)}
-                  value={f.value ?? code.chBuCd[0]?.val} className={""} label={""}                />
-              </FormUi>
-            )}
-          />
-        </div>
-        <div className="">
-          <FormField
-            control={form.control}
-            name={`chgBuilding.${index}.archChgPrmsnDt`}
-            render={({ field: f }) => (
-              <FormUi label="허가일">
-                <DatePicker
-                  mode="single"
-                  field={{
-                    value: safeDate(f.value) || new Date(),
-                    onChange: (date) => f.onChange(date),
-                  }}
-                  selectClass="w-full"
+      {type !== "HTB" ? (
+        <>
+          <div className="grid grid-cols-6 gap-2 mt-4 ">
+            <div className="col-span-2">
+              <FormField
+                control={form.control}
+                name="reuseBuilding.0.bdstUsgCd"
+                render={({ field }) => (
+                  <FormUi label="건축물용도">
+                    <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.bdstUsgCd}
+                      onSelectValue={(val) => {
+                        field.onChange(Number(val));
+                      }}
+                      value={field.value ?? code.bdstUsgCd[0]?.val}
+                    />
+                  </FormUi>
+                )}
+              />
+            </div>
+
+            <div className="col-span-2">
+              <FormField
+                control={form.control}
+                name="archArea"
+                render={({ field }) => (
+                  <FormUi label="건축면적(m³)">
+                    <Input
+                      className={selectClass}
+                      placeholder="면적을 입력하세요"
+                      type="text"
+                      onChange={(e) => {
+                        handleCommaNumberChange(e, field.onChange);
+                      }}
+                      value={formatCommaNumber(field.value)}
+                    />
+                  </FormUi>
+                )}
+              />
+            </div>
+            <div className="col-span-2">
+              <FormField
+                control={form.control}
+                name="reuseBuilding.0.lawTrgtYn"
+                render={({ field }) => (
+                  <FormUi label="법정의무대상여부">
+                    <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.yn}
+                      onSelectValue={(val) => {
+                        field.onChange(val);
+                      }}
+                      value={field.value ?? code.yn[0]?.val}
+                    />
+                  </FormUi>
+                )}
+              />
+            </div>
+          </div>
+          <h1 className={formH1Class}>중축, 개축, 재축</h1>
+          <div className="flex justify-end gap-2 mt-4">
+            <Button type="button" className="" size={"sm"} onClick={plusHist}>
+              이력추가
+            </Button>
+            <Button
+              type="button"
+              className="!bg-red-500 text-white"
+              size={"sm"}
+              onClick={removeSelected}
+            >
+              삭제
+            </Button>
+          </div>
+          {fields.map((field, index) => (
+            <div
+              key={field.id}
+              className="grid grid-cols-[auto,1fr,1fr,1fr] gap-2 mt-4 items-center"
+            >
+              <div className="col-span-1 flex justify-center mr-4">
+                <Checkbox
+                  checked={selectedIds.includes(field.id)}
+                  onCheckedChange={() => toggleSelect(field.id)}
                 />
-              </FormUi>
-            )}
-          />
-        </div>
-        <div className="">
-          <FormField
-            control={form.control}
-            name={`chgBuilding.${index}.archChgArea`}
-            render={({ field: f }) => (
-              <FormUi label="면적">
-                <Input
-                  placeholder="-"
-                  type="text"
-                  onChange={e => f.onChange}
-                  value={f.value}
-                  className={selectClass}
+              </div>
+              <div className="">
+                <FormField
+                  control={form.control}
+                  name={`chgBuilding.${index}.bdstChgNm`}
+                  render={({ field: f }) => (
+                    <FormUi label="구분">
+                      <SelectBox
+                        selectClass={selectClass}
+                        selectArray={code.chBuCd}
+                        onSelectValue={(val) => f.onChange(val)}
+                        value={f.value ?? code.chBuCd[0]?.val}
+                        className={""}
+                        label={""}
+                      />
+                    </FormUi>
+                  )}
                 />
-              </FormUi>
-            )}
-          />
-        </div>
-      </div>
-    ))}
-      <div className="border-b border-gray-300 my-4"> </div>
+              </div>
+              <div className="">
+                <FormField
+                  control={form.control}
+                  name={`chgBuilding.${index}.archChgPrmsnDt`}
+                  render={({ field: f }) => (
+                    <FormUi label="허가일">
+                      <DatePicker
+                        mode="single"
+                        field={{
+                          value: safeDate(f.value) || new Date(),
+                          onChange: (date) => f.onChange(date),
+                        }}
+                        selectClass="w-full"
+                      />
+                    </FormUi>
+                  )}
+                />
+              </div>
+              <div className="">
+                <FormField
+                  control={form.control}
+                  name={`chgBuilding.${index}.archChgArea`}
+                  render={({ field: f }) => (
+                    <FormUi label="면적">
+                      <Input
+                        placeholder="-"
+                        type="text"
+                        onChange={(e) => f.onChange}
+                        value={f.value}
+                        className={selectClass}
+                      />
+                    </FormUi>
+                  )}
+                />
+              </div>
+            </div>
+          ))}
+          <div className="border-b border-gray-300 my-4"> </div>
+        </>
+      ) : (
+        <></>
+      )}
     </>
   );
 }
diff --git a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
index 70e62eb7f..5547f057b 100644
--- a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
@@ -23,15 +23,18 @@ import {
   handleCommaNumberChange,
 } from "@/components/lib/func/commom";
 import { formH1Class } from "@/components/lib/class/comClass";
+import toast from "react-hot-toast";
 
 export default function HtdflRegForm({
   htdflForm,
   isModal,
-  readonly = false
+  readonly = false,
+  setIsModal,
 }: {
   htdflForm: customHtdflBdst;
   isModal: boolean;
   readonly?: boolean;
+  setIsModal?: (modal: boolean) => void;
 }) {
   const { code, htdflBdstUpdate, htdflBdstReg } = useWrStore((state) => state);
 
@@ -41,16 +44,26 @@ export default function HtdflRegForm({
     resolver: zodResolver(hdtflZod),
     defaultValues: defaultValues,
   });
+  const [regCtpvCd, regSggcd] = form.watch(["ctpvCd", "sggCd"]);
 
   const onSubmit = (values: z.infer<typeof hdtflZod>) => {
     if (isModal) {
-      htdflBdstReg(values, '41');
+      const data = regCtpvCd ? regCtpvCd : regSggcd ? regSggcd : "noCd";
+
+      if (data === "noCd") {
+        toast.error("시도/시군구 코드를 선택해야합니다.");
+        return;
+      }
+      htdflBdstReg(values,data);
+      if (setIsModal) setIsModal(false);
     } else {
-      htdflBdstUpdate(values, '41');
+
+      console.log(' isModal  ' ,isModal)
+      console.log(' values  ' ,values)
+      htdflBdstUpdate(values, "41");
     }
   };
 
-
   const cleanHtdflData = (raw: any): z.infer<typeof hdtflZod> => {
     return {
       ...raw,
@@ -80,9 +93,31 @@ export default function HtdflRegForm({
     console.log("form errors:", form.formState.errors);
   }, [form.formState.errors]);
 
+  // form.reset은 비동기로 동작할 수 있어, useEffect 하나로 관리하여 의도치 않은 초기화를 방지합니다.
   useEffect(() => {
-    if (hdtflZod) form.reset(cleanHtdflData(htdflForm));
-  }, [htdflForm]);
+    // Case 1: 수정 또는 '복사하여 등록' 등 데이터가 주입되는 경우
+    if (htdflForm && Object.keys(htdflForm).length > 0) {
+      form.reset(cleanHtdflData(htdflForm));
+    }
+    // Case 2: 데이터가 없는 순수 신규 등록 모드인 경우
+    if(isModal) {
+      const firstYnValue = code.yn?.[0]?.val;
+      const firstHtdPowerMthdCd = code.htdPowerMthdCd?.[0]?.val;
+      const firstHtdUtztnUsgCd = code.htdUtztnUsgCd?.[0]?.val;
+
+      if (firstHtdPowerMthdCd) {
+        form.setValue('reuseBuilding.0.htdflObj.etgtType', firstHtdPowerMthdCd, { shouldDirty: true });
+      }
+      if (firstYnValue) {
+        form.setValue('reuseBuilding.0.htdflObj.plwtYn', firstYnValue as "Y" | "N", { shouldDirty: true });
+        form.setValue('reuseBuilding.0.htdflObj.prcsProcsYn', firstYnValue as "Y" | "N", { shouldDirty: true });
+        form.setValue('reuseBuilding.0.htdflObj.fmYn', firstYnValue as "Y" | "N", { shouldDirty: true });
+      }
+      if (firstHtdUtztnUsgCd) {
+        form.setValue('reuseBuilding.0.htdflObj.utztnUsg', firstHtdUtztnUsgCd, { shouldDirty: true });
+      }
+    }
+  }, [htdflForm, code, form]);
 
   return (
     <div className="!mx-[1.6rem] !p-0r">
@@ -91,20 +126,30 @@ export default function HtdflRegForm({
           {/* <div className="flex justify-between items-center mx-3"> */}
           <div>
             <div className="grid grid-cols-12 flex items-center card-header">
-              <h1 className="text-2xl font-medium text-label col-span-10">온배수 시설 정보</h1>
+              <h1 className="text-2xl font-medium text-label col-span-10">
+                온배수 시설 등록
+              </h1>
               {!readonly && (
-                <Button type="submit" className="col-start-12 col-span-1" size={"sm"}>
+                <Button
+                  type="submit"
+                  className="col-start-12 col-span-1"
+                  size={"sm"}
+                >
                   저장
                 </Button>
               )}
             </div>
           </div>
 
-          {isModal && htdflForm != undefined ? <BdstReg form={form} /> : <></>}
+          {isModal && htdflForm != undefined ? (
+            <BdstReg form={form} type="HTB" />
+          ) : (
+            <></>
+          )}
           {isModal ? (
-            <h1 className="text-xl col-span-10 mt-4">
-              온배수 시설 정보{" "}
-            </h1>
+            <div className=" my-4">
+              <h1 className={formH1Class}>온배수 시설 정보 </h1>
+            </div>
           ) : (
             <></>
           )}
@@ -115,15 +160,14 @@ export default function HtdflRegForm({
                 control={form.control}
                 name="reuseBuilding.0.htdflObj.etgtType"
                 render={({ field }) => (
-                  <FormUi label="발전유형(코드정비후 수정)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
+                  <FormUi label="발전유형">
+                       <SelectBox
+                      className={""}
+                      label={""}
+                      selectClass={selectClass}
+                      selectArray={code.htdPowerMthdCd}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e)
-                      }}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -136,13 +180,14 @@ export default function HtdflRegForm({
                 control={form.control}
                 name="reuseBuilding.0.htdflObj.fclCpct" // 이름 이상함.
                 render={({ field }) => (
-                  <FormUi label="설비용량">
+                  <FormUi label="설비용량(KW)">
                     <Input
                       className={selectClass}
                       placeholder="1,000,000"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -162,8 +207,8 @@ export default function HtdflRegForm({
                       label={""}
                       selectClass={selectClass}
                       selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? ""}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -172,9 +217,7 @@ export default function HtdflRegForm({
             </div>
           </div>
           <div className=" my-4">
-            <h1 className={formH1Class}>
-              온배수 시설 운영현황
-            </h1>
+            <h1 className={formH1Class}>온배수 시설 운영현황</h1>
           </div>
 
           <div className="grid grid-cols-10 gap-1 mt-4">
@@ -183,14 +226,14 @@ export default function HtdflRegForm({
                 control={form.control}
                 name="reuseBuilding.0.htdflObj.orgwtWtritSpt"
                 render={({ field }) => (
-                  <FormUi label="원수취수 지점(코드정비후 수정)">
+                  <FormUi label="원수취수 지점">
                     <Input
                       className={selectClass}
-                      placeholder="1,000,000"
+                      placeholder=""
                       type="text"
-                      value={field.value ?? 0}
+                      value={field.value ?? ''}
                       onChange={(e) => {
-                        if (!readonly) field.onChange(Number(e.target.value));
+                        if (!readonly) field.onChange((e.target.value));
                       }}
                       readOnly={readonly}
                     />
@@ -206,11 +249,11 @@ export default function HtdflRegForm({
                   <FormUi label="원수발생 공정">
                     <Input
                       className={selectClass}
-                      placeholder="1,000,000"
-                      type=""
+                      placeholder=""
+                      type="text"
                       value={field.value ?? ""}
                       onChange={(e) => {
-                        if (!readonly) field.onChange
+                        if (!readonly) field.onChange(e.target.value);
                       }}
                       readOnly={readonly}
                     />
@@ -223,13 +266,35 @@ export default function HtdflRegForm({
                 control={form.control}
                 name="reuseBuilding.0.htdflObj.wtritEntrcTp"
                 render={({ field }) => (
-                  <FormUi label="취수구 온도">
+                  <FormUi label="취수구 온도(℃)">
                     <Input
                       className={selectClass}
                       placeholder="1,000,000"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
+                      }}
+                      value={formatCommaNumber(field.value)}
+                      readOnly={readonly}
+                    />
+                  </FormUi>
+                )}
+              />
+            </div>
+            <div className="col-span-5">
+              <FormField
+                control={form.control}
+                name="reuseBuilding.0.htdflObj.emsnExitTp"
+                render={({ field }) => (
+                  <FormUi label="배출구 온도(℃)">
+                    <Input
+                      className={selectClass}
+                      placeholder="10"
+                      type="text"
+                      onChange={(e) => {
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -249,7 +314,8 @@ export default function HtdflRegForm({
                       placeholder="1,000,000"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -263,14 +329,14 @@ export default function HtdflRegForm({
                 control={form.control}
                 name="reuseBuilding.0.htdflObj.prcsProcsYn"
                 render={({ field }) => (
-                  <FormUi label="처리공정">
+                  <FormUi label="처리공정 유무">
                     <SelectBox
                       className={""}
                       label={""}
                       selectClass={selectClass}
                       selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? ""}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -288,7 +354,8 @@ export default function HtdflRegForm({
                       placeholder="1,000,000"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -308,8 +375,8 @@ export default function HtdflRegForm({
                       selectClass={selectClass}
                       label={""}
                       selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? ""}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -327,7 +394,8 @@ export default function HtdflRegForm({
                       placeholder="1,000,000"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -342,14 +410,13 @@ export default function HtdflRegForm({
                 name="reuseBuilding.0.htdflObj.utztnUsg"
                 render={({ field }) => (
                   <FormUi label="이용용도">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
+                   <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.htdUtztnUsgCd}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? ""}
-                      onChange={() => {
-                        if (!readonly) field.onChange
-                      }}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -359,9 +426,7 @@ export default function HtdflRegForm({
           </div>
 
           <div className=" my-2">
-            <h1 className={formH1Class}>
-              요구수질
-            </h1>
+            <h1 className={formH1Class}>수질</h1>
           </div>
 
           <div className="grid grid-cols-12 gap-4">
@@ -376,7 +441,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -397,7 +463,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -420,7 +487,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -441,7 +509,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -464,7 +533,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -485,7 +555,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -508,7 +579,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -529,7 +601,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -552,7 +625,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -573,7 +647,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -596,7 +671,8 @@ export default function HtdflRegForm({
                       placeholder="10"
                       type="text"
                       onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
+                        if (!readonly)
+                          handleCommaNumberChange(e, field.onChange);
                       }}
                       value={formatCommaNumber(field.value)}
                       readOnly={readonly}
@@ -606,26 +682,6 @@ export default function HtdflRegForm({
               />
             </div>
 
-            <div className="col-span-6">
-              <FormField
-                control={form.control}
-                name="reuseBuilding.0.htdflObj.emsnExitTp"
-                render={({ field }) => (
-                  <FormUi label="배출구온도">
-                    <Input
-                      className={selectClass}
-                      placeholder="10"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
-              />
-            </div>
           </div>
         </form>
       </Form>
diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
index d2f9b79e6..8ea07535d 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
@@ -194,6 +194,23 @@ export function PbnstBuseForm({
     name: `items.${indexMng}.fcBizs.${indexBiz}.fcDemands`,
   });
 
+  const demandsContainerRef = useRef<HTMLDivElement>(null);
+  const prevDemandsLengthRef = useRef(fcDemands.length);
+
+  // 수요처 추가 시 새로 추가된 항목으로 스크롤하는 효과
+  useEffect(() => {
+    // 수요처 항목이 추가되었는지 확인 (길이가 이전보다 길어졌는지)
+    if (fcDemands.length > prevDemandsLengthRef.current) {
+      // 컨테이너의 마지막 자식 요소(새로 추가된 수요처 폼)로 부드럽게 스크롤
+      demandsContainerRef.current?.lastElementChild?.scrollIntoView({
+        behavior: "smooth",
+        block: "end",
+      });
+    }
+    // 다음 렌더링을 위해 현재 길이를 ref에 저장
+    prevDemandsLengthRef.current = fcDemands.length;
+  }, [fcDemands.length]);
+
   const { fields: fcOrgwtFiled } = useFieldArray({
     control: form.control,
     name: `items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`,
@@ -351,7 +368,7 @@ export function PbnstBuseForm({
                 <MngRegFormDetail
                   key={`buziMoney-${indexMng}-${indexBiz}`}
                   formList={businessMoneyInfo}
-                  h1Title={"사업비"}
+                  h1Title={"사업비(원)"}
                   form={form}
                   moClass="grid grid-cols-12 gap-4"
                   sonClass="col-span-4"
@@ -429,7 +446,7 @@ export function PbnstBuseForm({
                   <Label className="text-right">합계</Label>
                   <Input
                     type="text"
-                    value={sumCpct}
+                    value={ formatCommaNumber(sumCpct)}
                     readOnly={true}
                     className="w-32  border-gray-300  rounded pr-8 "
                   />
@@ -488,7 +505,8 @@ export function PbnstBuseForm({
 
                 <MngRegFormDetail
                   formList={ruseWaterQulityList}
-                  h1Title={"하수처리수 재이용시설 보증수질"}
+                  h1Title={`하수처리수 재이용시설 보증수질 `}
+                  subTitle="※재처리시설이 있는 경우만 작성"
                   form={form}
                   moClass="grid grid-cols-12 gap-4"
                   sonClass="col-span-4"
@@ -524,16 +542,11 @@ export function PbnstBuseForm({
                       수요처 신규등록
                     </Button>
                   </div>
-                  {(
-                    form.getValues(
-                      `items.${indexMng}.fcBizs.${indexBiz}.fcDemands`
-                    ) || []
-                  ).map((field, index) => (
+                  <div ref={demandsContainerRef}>
+                    {fcDemands.map((field, index) => (
                     <div
-                      key={`fcDemands-${indexMng}-${indexBiz}=${index}`} // 이게 핵심!
-                      className="grid grid-cols-12 gap-4 mt-3
-                      border-b border-gray-400 pb-3
-                      "
+                        key={field.id} // useFieldArray의 고유 id를 key로 사용
+                        className="grid grid-cols-12 gap-4 mt-3 border-b border-gray-400 pb-3"
                     >
                       <div key={index + "keySon1"} className="col-span-4">
                         <FormField
@@ -664,7 +677,7 @@ export function PbnstBuseForm({
                           control={form.control}
                           name={`items.${indexMng}.fcBizs.${indexBiz}.fcDemands.${index}.splyCpct`}
                           render={({ field: f }) => (
-                            <FormUi label="(계약)공급량(m3/일)">
+                            <FormUi label="(계약)공급량(m³/일)">
                               <Input
                                 placeholder=""
                                 type="text"
@@ -698,7 +711,8 @@ export function PbnstBuseForm({
                         />
                       </div>
                     </div>
-                  ))}
+                    ))}
+                  </div>
                 </div>
               </form>
             </Form>
diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
index 30fab689e..fb50e1b89 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
@@ -14,6 +14,7 @@ import { Input } from "@common/components/ui";
 export default function MngRegFormDetail({
   formList,
   h1Title,
+  subTitle,
   form,
   moClass,
   sonClass,
@@ -22,6 +23,7 @@ export default function MngRegFormDetail({
 }: {
   formList: formDetailType[];
   h1Title?: string;
+  subTitle?:string
   form: any;
   moClass?: string;
   indexBiz?: number;
@@ -33,6 +35,8 @@ export default function MngRegFormDetail({
   return (
     <>
       {h1Title ? <h1 className={formH1Class}>{h1Title}</h1> : <></>}
+      {subTitle ? <h3 className={'items-center'}>{subTitle}</h3> : <></>}
+
       <div className={moClass}>
         {formList?.map((formHead, index) => {
           const fieldId =
diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
index b893f9bf4..7333f6091 100644
--- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
@@ -9,16 +9,10 @@ import {
 import { formH1Class, formH2Class } from "@/components/lib/class/comClass";
 import {
   formatCommaNumber,
-  handleCommaNumberChange,
   handleMinusNumberChange,
 } from "@/components/lib/func/commom";
 import { DatePicker, FormUi } from "@common/business_components";
-import {
-  Form,
-  FormField,
-  FormLabel,
-  SelectBox,
-} from "@common/business_components/ui";
+import { Form, FormField, SelectBox } from "@common/business_components/ui";
 import { Button, Checkbox, Input, Label } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useState } from "react";
@@ -31,11 +25,11 @@ export default function RainRegForm({
   rainForm,
   isModal,
   readonly = false,
-  setIsModal
+  setIsModal,
 }: {
   rainForm: customRainBdst;
   isModal: boolean;
-  setIsModal?:(modal:boolean) => void
+  setIsModal?: (modal: boolean) => void;
   readonly?: boolean;
 }) {
   const { code, rainBdstReg, rainBdstUpdate, rain } = useWrStore(
@@ -100,20 +94,19 @@ export default function RainRegForm({
       form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctPrs", "");
     }
 
-    if(grntchBdstCertYn === "D") {
+    if (grntchBdstCertYn === "D") {
       form.setValue("reuseBuilding.0.grntchBdstCertYr", "0000");
       form.setValue("reuseBuilding.0.grntchBdstCertNo", "확인불가");
       form.setValue("reuseBuilding.0.grntchBdstCertGrd", "확인불가");
-    }else if (instlCstSprtYn === "D") {
+    } else if (instlCstSprtYn === "D") {
       form.setValue("reuseBuilding.0.instlCstSprtAmt", -1);
     } else if (filtrTrtmfctYn === "D") {
       form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctCpct", -1);
       form.setValue("reuseBuilding.0.rainyObj.filtrTrtmfctPrs", "확인불가");
     }
-
   }, [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctYn]);
 
-const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
+  const [regCtpvCd, regSggcd] = form.watch(["ctpvCd", "sggCd"]);
 
   // form 값이 변경될 때마다 로그 출력
   useEffect(() => {
@@ -127,15 +120,15 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
 
   const onSubmit = (values: z.infer<typeof rainZod>) => {
     if (isModal) {
-      const data = regCtpvCd?regCtpvCd:regSggcd?regSggcd:'noCd'
-      
-      if(data ==='noCd'){
+      const data = regCtpvCd ? regCtpvCd : regSggcd ? regSggcd : "noCd";
+
+      if (data === "noCd") {
         toast.error("시도/시군구 코드를 선택해야합니다.");
-        return
+        return;
       }
 
       rainBdstReg(values, data);
-      setIsModal(false)
+      if (setIsModal) setIsModal(false);
     } else {
       rainBdstUpdate(values, "41");
     }
@@ -207,29 +200,27 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
                   const value = field.value;
                   const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
                   return (
-                    <div className="flex items-center gap-2">
-                      <FormUi label="설치비(원)">
-                        <Input
-                          placeholder="1,000,000"
-                          type="text"
-                          className={selectClass}
-                          readOnly={readonly }
-                          value={
-                            isUnknown ? "확인불가" : formatCommaNumber(value)
+                    <FormUi label="설치비(원)">
+                      <Input
+                        placeholder="1,000,000"
+                        type="text"
+                        className={selectClass}
+                        readOnly={readonly}
+                        value={
+                          isUnknown ? "확인불가" : formatCommaNumber(value)
+                        }
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
                           }
-                          onFocus={() => {
-                            // 입력 시 자동으로 확인불가 해제
-                            if (isUnknown && !readonly) {
-                              field.onChange(""); // 초기화
-                            }
-                          }}
-                          onChange={(e) => {
-                            if (readonly ) return;
-                            handleMinusNumberChange(e, field.onChange);
-                          }}
-                        />
-                      </FormUi>
-                    </div>
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                      />
+                    </FormUi>
                   );
                 }}
               />
@@ -246,34 +237,34 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.dtfcltCpct"
-                render={({ field }) =>
-                  
-                  {
-                    const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1
+                render={({ field }) => {
+                  const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1
                   return (
-                  <FormUi label="저류조 용량(m³)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      value={
-                        isUnknown ? "확인불가" : formatCommaNumber(field.value)
-                      }
-                      onFocus={() => {
-                        // 입력 시 자동으로 확인불가 해제
-                        if (isUnknown && !readonly) {
-                          field.onChange(""); // 초기화
+                    <FormUi label="저류조 용량(m³)">
+                      <Input
+                        className={selectClass}
+                        placeholder="1,000,000"
+                        type="text"
+                        value={
+                          isUnknown
+                            ? "확인불가"
+                            : formatCommaNumber(field.value)
                         }
-                      }}
-                      onChange={(e) => {
-                        if (readonly ) return;
-                        handleMinusNumberChange(e, field.onChange);
-                      }}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )
-              }}
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        readOnly={readonly}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
             <div className="col-span-4">
@@ -319,13 +310,12 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
                             }
                           }}
                           onChange={(e) => {
-                            if (readonly ) return;
+                            if (readonly) return;
                             handleMinusNumberChange(e, field.onChange);
                           }}
                           readOnly={readonly}
                         />
                       </FormUi>
-
                     </div>
                   );
                 }}
@@ -360,36 +350,35 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rainyObj.filtrTrtmfctCpct"
-                render={({ field }) => 
-                  
-                  
-                  {
+                render={({ field }) => {
                   const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1
-                return(
-                  <FormUi label="용량(m³/일)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      value={
-                        isUnknown ? "확인불가" : formatCommaNumber(field.value)
-                      }
-                      onFocus={() => {
-                        // 입력 시 자동으로 확인불가 해제
-                        if (isUnknown && !readonly) {
-                          field.onChange(""); // 초기화
+                  return (
+                    <FormUi label="용량(m³/일)">
+                      <Input
+                        className={selectClass}
+                        placeholder="1,000,000"
+                        type="text"
+                        value={
+                          isUnknown
+                            ? "확인불가"
+                            : formatCommaNumber(field.value)
                         }
-                      }}
-                      onChange={(e) => {
-                        if (readonly ) return;
-                        handleMinusNumberChange(e, field.onChange);
-                      }}
-                      readOnly={readonly}
-                      disabled={filtrTrtmfctYn !== "Y"}
-                    />
-                  </FormUi>
-                )
-              }}
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        readOnly={readonly}
+                        disabled={filtrTrtmfctYn !== "Y"}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
             <div className="col-span-4">
@@ -404,7 +393,7 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
                     <div className="flex items-center gap-2">
                       <FormUi label="처리공정">
                         <Input
-                          className={' h-full !text-xl col-span-4' }
+                          className={" h-full !text-xl col-span-4"}
                           placeholder="처리공정 입력"
                           type="text"
                           value={field.value ?? ""}
@@ -413,7 +402,6 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
                           disabled={filtrTrtmfctYn !== "Y"}
                         />
                       </FormUi>
-       
                     </div>
                   );
                 }}
@@ -450,35 +438,34 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.instlCstSprtAmt"
-                render={({ field }) => 
-                 {
+                render={({ field }) => {
                   const value = field.value;
                   const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
-                   return (
-                   <FormUi label="지원금액(원)">
-                     <Input
-                       className={selectClass}
-                       placeholder=""
-                       type="text"
-                       readOnly={readonly || isUnknown}
-                       value={
-                        isUnknown ? "확인불가" : formatCommaNumber(value)
-                      }
-                      onFocus={() => {
-                        // 입력 시 자동으로 확인불가 해제
-                        if (isUnknown && !readonly) {
-                          field.onChange(""); // 초기화
+                  return (
+                    <FormUi label="지원금액(원)">
+                      <Input
+                        className={selectClass}
+                        placeholder=""
+                        type="text"
+                        readOnly={readonly || isUnknown}
+                        value={
+                          isUnknown ? "확인불가" : formatCommaNumber(value)
                         }
-                      }}
-                      onChange={(e) => {
-                        if (readonly ) return;
-                        handleMinusNumberChange(e, field.onChange);
-                      }}
-                       disabled={instlCstSprtYn !== "Y"}
-                     />
-                   </FormUi>
-                 )}
-                 }
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        disabled={instlCstSprtYn !== "Y"}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
           </div>
@@ -508,10 +495,10 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.grntchBdstCertYr"
-                render={({ field }) => 
-                  {
-                    const isUnknown = field.value === null || field.value === "0000"; // 또는 Number(value) === -1
-                    return (
+                render={({ field }) => {
+                  const isUnknown =
+                    field.value === null || field.value === "0000"; // 또는 Number(value) === -1
+                  return (
                     <FormUi label="인증년도">
                       <Input
                         className={selectClass}
@@ -523,43 +510,57 @@ const [regCtpvCd , regSggcd] = form.watch(['ctpvCd','sggCd'])
                             field.onChange(""); // 초기화
                           }
                         }}
-                        value={
-                          
-                          isUnknown?'확인불가':field.value ?? ""}
+                        value={isUnknown ? "확인불가" : (field.value ?? "")}
                         onChange={(e) => {
-                          if (readonly) return
-                          
-                          if (e.target.value  === '확인불가') {
-                            field.onChange('0000');
-                          }else{
+                          if (readonly) return;
+                          if (e.target.value === "확인불가") {
+                            field.onChange("0000");
+                          } else {
                             field.onChange(e.target.value);
                           }
                         }}
                         disabled={grntchBdstCertYn !== "Y"}
+                        max={4}
                       />
                     </FormUi>
-                  )}
-                  }
+                  );
+                }}
               />
             </div>
             <div className="col-span-3 ">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.grntchBdstCertNo"
-                render={({ field }) => (
-                  <FormUi label="인증번호">
-                    <Input
-                      className={selectClass}
-                      placeholder="ab1234678"
-                      type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e);
-                      }}
-                      disabled={grntchBdstCertYn !== "Y"}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const isUnknown =
+                    field.value === null || field.value === "0000"; // 또는 Number(value) === -1
+                  return (
+                    <FormUi label="인증번호">
+                      <Input
+                        className={selectClass}
+                        placeholder="ab1234678"
+                        type=""
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        value={isUnknown ? "확인불가" : (field.value ?? "")}
+                        onChange={(e) => {
+                          if (readonly) return;
+
+                          if (e.target.value === "확인불가") {
+                            field.onChange("");
+                          } else {
+                            field.onChange(e.target.value);
+                          }
+                        }}
+                        disabled={grntchBdstCertYn !== "Y"}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
             <div className="col-span-3">
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
index d820bddc1..ed0e51af6 100644
--- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
@@ -10,6 +10,7 @@ import { formH1Class, formH2Class } from "@/components/lib/class/comClass";
 import {
   formatCommaNumber,
   handleCommaNumberChange,
+  handleMinusNumberChange,
 } from "@/components/lib/func/commom";
 import {
   DatePicker,
@@ -21,7 +22,7 @@ import {
 import { Button, Input } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect } from "react";
-import { useForm } from "react-hook-form";
+import { useForm, type UseFormReturn } from "react-hook-form";
 import { z } from "zod";
 import BdstReg from "../bdstReg/bdstReg";
 
@@ -29,7 +30,7 @@ export default function RswtrRegForm({
   rswtForm,
   isModal,
   setIsModal,
-  readonly = false
+  readonly = false,
 }: {
   rswtForm: customRswtBdst;
   isModal: boolean;
@@ -56,7 +57,7 @@ export default function RswtrRegForm({
   const onSubmit = (values: z.infer<typeof rswtZod>) => {
     if (isModal) {
       rswtBdstReg(values, "41");
-    if(setIsModal)  setIsModal(false)
+      if (setIsModal) setIsModal(false);
     } else {
       rswtBdstUpdate(values, "41");
     }
@@ -73,21 +74,19 @@ export default function RswtrRegForm({
       reuseBuilding: (raw?.reuseBuilding || []).map((item: any) => ({
         ...item,
         instlCmptnDt: item?.instlCmptnDt
-        ? new Date(item.instlCmptnDt)
-        : new Date(), // item?.instlCmptnDt가 유효하지 않으면 현재 날짜로 초기화
-      operMngCd: item?.operMngCd ?? "", // null → ""
-      instlCstSprtYn: item?.instlCstSprtYn ?? "Y", // null → "Y"
-      grntchBdstCertYn:item?.grntchBdstCertYn??"Y",
-      rswtrObj: {
+          ? new Date(item.instlCmptnDt)
+          : new Date(), // item?.instlCmptnDt가 유효하지 않으면 현재 날짜로 초기화
+        operMngCd: item?.operMngCd ?? "", // null → ""
+        instlCstSprtYn: item?.instlCstSprtYn ?? "Y", // null → "Y"
+        grntchBdstCertYn: item?.grntchBdstCertYn ?? "Y",
+        rswtrObj: {
           ...item?.rswtrObj,
           filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
-
         },
       })),
     };
   };
 
-
   useEffect(() => {
     console.log("form errors:", form.formState.errors);
   }, [form.formState.errors]);
@@ -99,6 +98,16 @@ export default function RswtrRegForm({
     } else if (instlCstSprtYn === "N") {
       form.setValue("reuseBuilding.0.instlCstSprtAmt", 0);
     }
+
+
+    if (grntchBdstCertYn === "D") {
+      form.setValue("reuseBuilding.0.grntchBdstCertYr", "0000");
+      form.setValue("reuseBuilding.0.grntchBdstCertNo", "확인불가");
+      form.setValue("reuseBuilding.0.grntchBdstCertGrd", "확인불가");
+    } else if (instlCstSprtYn === "D") {
+      form.setValue("reuseBuilding.0.instlCstSprtAmt", -1);
+    } 
+
   }, [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctProcs, form]);
 
   useEffect(() => {
@@ -116,7 +125,11 @@ export default function RswtrRegForm({
                 건축물 운영정보
               </h1>
               {!readonly && (
-                <Button type="submit" className="col-start-12 col-span-1" size={"sm"}>
+                <Button
+                  type="submit"
+                  className="col-start-12 col-span-1"
+                  size={"sm"}
+                >
                   저장
                 </Button>
               )}
@@ -155,68 +168,37 @@ export default function RswtrRegForm({
                 )}
               />
             </div>
-
             <div className="col-span-2">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.instlCst"
-                render={({ field }) => (
-                  <FormUi label="설치비">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
-              />
-            </div>
-          </div>
-          <div className="grid grid-cols-4 gap-2 mt-4">
-            <div className="col-span-2">
-              <FormField
-                control={form.control}
-                name="reuseBuilding.0.rswtrObj.wtrUsqty"
-                render={({ field }) => (
-                  <FormUi label="물사용량(m³)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
-              />
-            </div>
-
-            <div className="col-span-2">
-              <FormField
-                control={form.control}
-                name="reuseBuilding.0.rswtrObj.oblgTrgtWtrUsqty"
-                render={({ field }) => (
-                  <FormUi label="의무대상 물사용량(m³)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+                  return (
+                    <FormUi label="설치비">
+                      <Input
+                        className={selectClass}
+                        placeholder="1,000,000"
+                        type="text"
+                        value={
+                          isUnknown ? "확인불가" : formatCommaNumber(value)
+                        }
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        readOnly={readonly}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
           </div>
@@ -229,20 +211,34 @@ export default function RswtrRegForm({
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.rswtrObj.filtrTrtmfctCpct"
-                render={({ field }) => (
-                  <FormUi label="처리시설 용량">
-                    <Input
-                      className={selectClass}
-                      placeholder=""
-                      type="number"
-                      value={field.value ?? 0}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(Number(e.target.value));
-                      }}
-                      readOnly={readonly}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+
+                  return (
+                    <FormUi label="처리시설 용량">
+                      <Input
+                        className={selectClass}
+                        placeholder=""
+                        type="text"
+                        value={
+                          isUnknown ? "확인불가" : formatCommaNumber(value)
+                        }
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        readOnly={readonly}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
             <div className="col-span-4">
@@ -256,7 +252,7 @@ export default function RswtrRegForm({
                       label={""}
                       selectClass={selectClass}
                       selectArray={code.orgwtKndCd}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? code.orgwtKndCd[0]?.val}
                       readOnly={readonly}
                     />
@@ -270,14 +266,13 @@ export default function RswtrRegForm({
                 name="reuseBuilding.0.rswtrObj.filtrTrtmfctProcs"
                 render={({ field }) => (
                   <FormUi label="주요처리공정">
-                    <Input
-                      className={selectClass}
-                      placeholder=""
-                      type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange
-                      }}
+                    <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.rswtPrscCdMthdCd}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? code.rswtPrscCdMthdCd[0]?.val}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -303,9 +298,9 @@ export default function RswtrRegForm({
                       className={""}
                       selectClass={selectClass}
                       label={""}
-                      selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      selectArray={code.bdstIncenYn}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? code.bdstIncenYn[0]?.val}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -313,23 +308,37 @@ export default function RswtrRegForm({
               />
             </div>
             <div className="col-span-1">
-              <FormField
+            <FormField
                 control={form.control}
                 name="reuseBuilding.0.instlCstSprtAmt"
-                render={({ field }) => (
-                  <FormUi label="지원금액(원)">
-                    <Input
-                      className={selectClass}
-                      placeholder="1,000,000"
-                      type="text"
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
-                      value={formatCommaNumber(field.value)}
-                      readOnly={instlCstSprtYn !== "Y"}
-                    />
-                  </FormUi>
-                )}
+                render={({ field }) => {
+                  const value = field.value;
+                  const isUnknown = value === null || value === -1; // 또는 Number(value) === -1
+                  return (
+                    <FormUi label="지원금액(원)">
+                      <Input
+                        className={selectClass}
+                        placeholder=""
+                        type="text"
+                        readOnly={readonly || isUnknown}
+                        value={
+                          isUnknown ? "확인불가" : formatCommaNumber(value)
+                        }
+                        onFocus={() => {
+                          // 입력 시 자동으로 확인불가 해제
+                          if (isUnknown && !readonly) {
+                            field.onChange(""); // 초기화
+                          }
+                        }}
+                        onChange={(e) => {
+                          if (readonly) return;
+                          handleMinusNumberChange(e, field.onChange);
+                        }}
+                        disabled={instlCstSprtYn !== "Y"}
+                      />
+                    </FormUi>
+                  );
+                }}
               />
             </div>
           </div>
@@ -348,8 +357,8 @@ export default function RswtrRegForm({
                       className={""}
                       selectClass={selectClass}
                       label={""}
-                      selectArray={code.yn}
-                      onSelectValue={readonly ? () => { } : field.onChange}
+                      selectArray={code.bdstIncenYn}
+                      onSelectValue={readonly ? () => {} : field.onChange}
                       value={field.value ?? code.yn[0]?.val}
                       readOnly={readonly}
                     />
@@ -361,41 +370,75 @@ export default function RswtrRegForm({
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.grntchBdstCertYr"
-                render={({ field }) => (
+                render={({ field }) =>
+                {
+                  const isUnknown = field.value === null || field.value === "0000"; // 또는 Number(value) === -1
+                  return (
                   <FormUi label="인증년도">
                     <Input
                       className={selectClass}
                       placeholder="2024"
-                      type="text"
-                      {...field}
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e)
+                      type=""
+                      onFocus={() => {
+                        // 입력 시 자동으로 확인불가 해제
+                        if (isUnknown && !readonly) {
+                          field.onChange(""); // 초기화
+                        }
                       }}
-                      readOnly={grntchBdstCertYn !== "Y"}
+                      value={
+                        isUnknown?'확인불가':field.value ?? ""}
+                      onChange={(e) => {
+                        if (readonly) return
+                        if (e.target.value  === '확인불가') {
+                          field.onChange('0000');
+                        }else{
+                          field.onChange(e.target.value);
+                        }
+                      }}
+                      disabled={grntchBdstCertYn !== "Y"}
+                      max={4}
                     />
                   </FormUi>
-                )}
+                )}}
               />
             </div>
             <div className="col-span-3">
               <FormField
                 control={form.control}
                 name="reuseBuilding.0.grntchBdstCertNo"
-                render={({ field }) => (
+                render={({ field }) => 
+                  {
+                    const isUnknown = field.value === null || field.value === "0000"; // 또는 Number(value) === -1
+                  return (
                   <FormUi label="인증번호">
                     <Input
                       className={selectClass}
                       placeholder="ab1234678"
                       type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e)
+                      onFocus={() => {
+                        // 입력 시 자동으로 확인불가 해제
+                        if (isUnknown && !readonly) {
+                          field.onChange(""); // 초기화
+                        }
                       }}
-                      readOnly={grntchBdstCertYn !== "Y"}
+                      value={
+                        isUnknown?'확인불가':field.value ?? ""}
+                      onChange={(e) => {
+                        if (readonly) return
+                        
+                        if (e.target.value  === '확인불가') {
+                          field.onChange('');
+                        }else{
+                          field.onChange(e.target.value);
+                        }
+                      }}
+                      disabled={grntchBdstCertYn !== "Y"}
+                
+
+
                     />
                   </FormUi>
-                )}
+                )}}
               />
             </div>
             <div className="col-span-3">
@@ -404,15 +447,14 @@ export default function RswtrRegForm({
                 name="reuseBuilding.0.grntchBdstCertGrd"
                 render={({ field }) => (
                   <FormUi label="인증등급">
-                    <Input
-                      className={selectClass}
-                      placeholder="A"
-                      type=""
-                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) field.onChange(e)
-                      }}
-                      readOnly={grntchBdstCertYn !== "Y"}
+                    <SelectBox
+                      className={""}
+                      selectClass={selectClass}
+                      label={""}
+                      selectArray={code.bdstGrntchClass}
+                      onSelectValue={readonly ? () => {} : field.onChange}
+                      value={field.value ?? code.bdstGrntchClass[0]?.val}
+                      readOnly={readonly}
                     />
                   </FormUi>
                 )}
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index 6ab1b25c4..bee445114 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -120,7 +120,12 @@ export function BdstReg<T extends MoType>({ moType,setIsModal,isModal }: BdstReg
       </div>
       <div className="border-t border-gray-300 my-4"></div>
       <div className="h-auto">
-        <h1 className="text-2xl font-medium text-label pl-8">건축물 목록  (유의 사항: 신규등록하려는 건축물이 목록에 없을 경우 하단 건축물 정보에 추가하여 주시기 바랍니다.)</h1>
+        <h1 className="text-2xl font-medium text-label pl-8">
+          건축물 목록
+          <span className="!text-2xl text-base  text-blue-500">
+            (유의 사항: 신규등록하려는 건축물이 목록에 없을 경우 하단 건축물 정보에 추가하여 주시기 바랍니다.)
+          </span>
+        </h1>
         <ScrollArea className="h-[30vh]">
           <div>
             <UiTable
@@ -143,7 +148,7 @@ export function BdstReg<T extends MoType>({ moType,setIsModal,isModal }: BdstReg
               <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={isModal} setIsModal={setIsModal} />
             :moType==='RST' 
               ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={isModal} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
-                            :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true}></HtdflRegForm>
+               :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true} setIsModal={(open) =>{setIsModal}}></HtdflRegForm>
             }
               
           </div>
diff --git a/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx b/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
index acb923687..6f4832c68 100644
--- a/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
+++ b/apps/wr/components/ui/table/pbnstReg/ruseMngTableForm/ruseMngTableForm.tsx
@@ -3,6 +3,10 @@ import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { customPbnst as OriginalCustomPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
 import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
+import {
+  formatCommaNumber,
+  handleCommaNumberChange,
+} from "@/components/lib/func/commom";
 
 import {
   DatePicker,
@@ -32,12 +36,24 @@ type RuseMngTableProps = {
   indexMng?: number;
   indexBiz?: number;
   form?: any;
-  formNm?:string
+  formNm?: string;
 };
 
 const RuseMngTableForm = React.forwardRef<any, RuseMngTableProps>(
-  ({ tableData, headList, upHeadList, code, onTableSet, indexMng, form,formNm,indexBiz }, ref) => {
-
+  (
+    {
+      tableData,
+      headList,
+      upHeadList,
+      code,
+      onTableSet,
+      indexMng,
+      form,
+      formNm,
+      indexBiz,
+    },
+    ref
+  ) => {
     return (
       <>
         <Table key={`table-${indexMng}-${indexBiz}`} variant="secondary">
@@ -73,26 +89,31 @@ const RuseMngTableForm = React.forwardRef<any, RuseMngTableProps>(
                         typeof indexMng === "number" &&
                         indexMng >= 0 &&
                         typeof indexBiz === "number" &&
-                        indexBiz >= 0?
-                        `items.${indexMng}.fcBizs.${indexBiz}.${formNm}.${i}.${head.id}`:
-                        typeof indexMng === "number" && indexMng >= 0?
-                        `items.${indexMng}.${formNm}.${i}.${head.id}`:
-                        `items.${indexMng}.${formNm}.${i}.${head.id}`}
+                        indexBiz >= 0
+                          ? `items.${indexMng}.fcBizs.${indexBiz}.${formNm}.${i}.${head.id}`
+                          : typeof indexMng === "number" && indexMng >= 0
+                            ? `items.${indexMng}.${formNm}.${i}.${head.id}`
+                            : `items.${indexMng}.${formNm}.${i}.${head.id}`
+                      }
                       render={({ field }) => (
                         <FormUi label="">
                           {head.edit === true ? (
                             <Input
                               className={`${head.type === "number" ? "text-right" : "text-center"} !text-xl`}
-                              type={head.type}
+                              type="text"
                               onChange={(txt) => {
-                                field.onChange(txt.target.value);
+                                if (head.type === "number") {
+                                  handleCommaNumberChange(txt, field.onChange);
+                                } else {
+                                  field.onChange(txt.target.value);
+                                }
                               }}
                               value={
                                 head.type === "number"
-                                  ? (Number(field.value) ?? 0)
+                                  ? formatCommaNumber(field.value)
                                   : field.value || ""
                               }
-                              readOnly ={head.readonly ? true : false}
+                              readOnly={head.readonly ? true : false}
                             />
                           ) : head.type === "select" ? (
                             <SelectBox
@@ -102,43 +123,41 @@ const RuseMngTableForm = React.forwardRef<any, RuseMngTableProps>(
                                   (item) => item.name === head.selectData
                                 )?.val ?? []
                               }
-                              value={
-                                field.value || ""
-                              }
+                              value={field.value || ""}
                               className={""}
                               selectClass={selectClass}
                               onSelectValue={(val) => {
-
-                                if(head.readonly === true){
-                                return
-                                }else{
-
+                                if (head.readonly === true) {
+                                  return;
+                                } else {
                                   field.onChange(val);
                                 }
                               }}
-                              readOnly ={head.readonly ? true : false}
+                              readOnly={head.readonly ? true : false}
                               // Disabled prop removed as SelectBox does not support it
                             ></SelectBox>
                           ) : head.type === "date" ? (
                             <DatePicker
                               mode="single"
                               field={{
-                                value:typeof field.value === "string" ? new Date(field.value) : field.value,
+                                value:
+                                  typeof field.value === "string"
+                                    ? new Date(field.value)
+                                    : field.value,
                                 onChange: (date: Date | undefined) => {
-
                                   console.log("date", date);
-                                    field.onChange(date); // readonly 상태가 아닐 때만 값 변경
+                                  field.onChange(date); // readonly 상태가 아닐 때만 값 변경
                                 },
                               }}
                               selectClass={"w-full"}
-                              readOnly ={head.readonly ? true : false}
+                              readOnly={head.readonly ? true : false}
                             />
                           ) : head.type === "checkbox" ? (
                             <Checkbox
                               className=""
-                              checked={ field.value || false}
+                              checked={field.value || false}
                               onCheckedChange={(checked) => {
-                              field.onChange(checked);
+                                field.onChange(checked);
                               }}
                             ></Checkbox>
                           ) : (

From 5d5b97d39f5eba6e453c3ba98f36cee9e6e14f2b Mon Sep 17 00:00:00 2001
From: YangJinSoo94 <jschrome782@gmail.com>
Date: Wed, 2 Jul 2025 17:26:10 +0900
Subject: [PATCH 14/44] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=82=AC=EB=A1=80=EA=B4=80=EB=A6=AC,=20=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EA=B2=B0=ED=95=A8=EC=A1=B0=EC=B9=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx | 16 ++++++++++----
 apps/wr/app/stats/rainStat/page.tsx           |  3 ++-
 apps/wr/app/stats/rswtStat/page.tsx           |  2 +-
 .../wr/app/store/matDmd/ruseCaseMng/index.tsx | 22 +++++++++++--------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx b/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
index 436b77736..517dab0c0 100644
--- a/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
+++ b/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
@@ -5,6 +5,7 @@ import { ruseUtzType } from "@/app/store/matDmd/ruseCaseMng/headList";
 import { excelDownload, getCity } from "@/components/lib/func/commom";
 import RuseCaseMngExcel from "@/components/ui/modal/coMat/ruseCaseMng/ruseCaseMngExcelModal";
 import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
+import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import {
     ContentsDiv,
     filePickedBlobArray,
@@ -20,11 +21,12 @@ import {
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components/ui";
-import { useState } from "react";
+import { useEffect, useState } from "react";
+import { toast, Toaster } from "react-hot-toast";
 
 export default function RuseCaseMng() {
     const { code, ruseCaseMng, selectRuseCaseMng } = useWrStore((state) => state);
-    const { ruseCaseMngList } = ruseCaseMng;
+    const { ruseCaseMngList, status } = ruseCaseMng;
     const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>([]);
     const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
     
@@ -142,7 +144,7 @@ export default function RuseCaseMng() {
             }
           ];
           // 버퍼에 있는 엑셀데이터 전달 후 json으로 변환
-          await filePickedBlobArray(blobRet, '시설정보및운영현황황', sheetParameter);
+          await filePickedBlobArray(blobRet, '물재이용사례현황', sheetParameter);
         });
     }
 
@@ -157,6 +159,12 @@ export default function RuseCaseMng() {
         );
     }
 
+    useEffect(() => {
+        if(status === 200){
+            setIsExcelOpen({ isModal: false });
+        }
+    }, [status]);
+
     return (
         <>
             <ContentsDiv>
@@ -239,7 +247,7 @@ export default function RuseCaseMng() {
                     </div>
                 </div>
             </ContentsDiv>
-
+            <Toaster position="top-center" />
             {/* 엑셀 등록 모달 */}
             <UiModal
                 open={isExcelOpen.isModal}
diff --git a/apps/wr/app/stats/rainStat/page.tsx b/apps/wr/app/stats/rainStat/page.tsx
index 08990028f..45d32d3a4 100644
--- a/apps/wr/app/stats/rainStat/page.tsx
+++ b/apps/wr/app/stats/rainStat/page.tsx
@@ -210,8 +210,9 @@ export default function RainStat() {
           ...item,
           ctpvCd: item.cityText
         };
-      })
+      }).filter((item: RainStatProps) => item.cityText !== '없음')
       : [];
+
     setBdstTable(tbData);
   }, [code, rainStatList]);
 
diff --git a/apps/wr/app/stats/rswtStat/page.tsx b/apps/wr/app/stats/rswtStat/page.tsx
index c0741433c..997e95ca5 100644
--- a/apps/wr/app/stats/rswtStat/page.tsx
+++ b/apps/wr/app/stats/rswtStat/page.tsx
@@ -46,7 +46,7 @@ export default function RswtStat() {
           ...item,
           ctpvCd: item.cityText
         };
-      })
+      }).filter((item: RswtStatProps) => item.cityText !== '없음')
       : [];
     setRswtTable(tbData);
   }, [code, rswtStatList])
diff --git a/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx b/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
index 915740f79..76468d249 100644
--- a/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
+++ b/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
@@ -1,12 +1,12 @@
 import { fetchType, getFetch, postFectch } from "@/components/lib/api";
 import type { TableUpperProps } from "../../common/type/header";
 import { ruseCaseHeadListExport } from "./headList";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
-
+import { toast } from "react-hot-toast";
 export type ruseCaseState = {
   ruseCaseMng: {
     ruseHeadList:TableUpperProps[];
     ruseCaseMngList:ruseCaseMngExcelProps[];
+    status: number;
   };
 };
 
@@ -69,7 +69,6 @@ type ruseCaseActions = {
 };
 
 export const fetchSearchRuseCaseMng = async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
-  
   const tailUrl = ((sigunguCd !== '전체' && sigunguCd !=='') ? `/${sigunguCd}` :  (sidoCd != '전체' && sidoCd != '') ? `/${sidoCd}` : `/0`) + (usageCd? `/${usageCd}` : '/0') + (name? `/${name}` : '');
   const resp = await getFetch(fetchType.WR,`/reuseFc/pubFcRuseCase${tailUrl}`);
   return resp;
@@ -77,7 +76,7 @@ export const fetchSearchRuseCaseMng = async (sidoCd: string, sigunguCd: string,
 
 export const fetchInsertRuseCaseMng = async (data: any) => {
   const response = await postFectch('/reuseFc/pubFcRuseCase', data, fetchType.WR);
-  return response.data;
+  return {data:response.data, status:response.status};
 };
 
 export type ruseCaseType = ruseCaseState & ruseCaseActions;
@@ -86,6 +85,7 @@ export const ruseCaseStateExport: ruseCaseState = {
   ruseCaseMng: {
     ruseHeadList:ruseCaseHeadListExport,
     ruseCaseMngList:[],
+    status: 0,
   },
 };
 
@@ -95,7 +95,6 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
   return {
     selectRuseCaseMng: async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
       const res = await fetchSearchRuseCaseMng(sidoCd, sigunguCd, usageCd, name);
-      console.log('res : ', res);
       set((state: ruseCaseState) => ({
         ruseCaseMng: {
           ...state.ruseCaseMng,
@@ -107,11 +106,16 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
     insertRuseCaseMng: async (data: any) => {
       const response = await fetchInsertRuseCaseMng(data);
       if(response.status === 200){
-        ToastFormUi({
-          body: "잠재수요처 등록이 완료되었습니다. ",
-          title: "잠재수요처 등록",
-        });
+        toast.success("물재이용사례 등록이 완료되었습니다. ");
+      }else{
+        toast.error("물재이용사례 등록에 실패하였습니다. ");
       }
+      set((state: ruseCaseState) => ({
+        ruseCaseMng: {
+          ...state.ruseCaseMng,
+          status: response.status,
+        },
+      }));
     },
   };
 };

From ed38451f84b9315f0c47486c68771d2f035dc554 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Wed, 2 Jul 2025 20:19:02 +0900
Subject: [PATCH 15/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=20=EC=9E=91=EC=97=85=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  |   6 +-
 .../prfmncReg/chkgdnReg/rainChkgdn/excel.tsx  |  20 +--
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  | 168 ++++++++++--------
 .../chkgdnSttn/rainChkgdnSttn/headList.tsx    |   2 +-
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       |   3 +-
 apps/wr/components/lib/func/TableData.tsx     |   3 +-
 .../ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx  |  71 ++++----
 .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx  |  23 ++-
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   |   7 +-
 apps/wr/public/sample_rainy.xlsx              | Bin 11216 -> 11262 bytes
 10 files changed, 166 insertions(+), 137 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index 53a7a31f3..88a0de300 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -20,7 +20,6 @@ import {
   SearchDiv,
   SearchFormLeft,
   SearchFormRight,
-  SearchInput,
   SelectBox,
   Title,
   UiModal,
@@ -29,7 +28,6 @@ import ListDiv from "@common/business_components/ui/list_div";
 import { Button, Label } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
 import { Toaster } from "react-hot-toast";
-import { shallow } from "zustand/shallow";
 
 export default function Page() {
   const {
@@ -135,8 +133,8 @@ export default function Page() {
   );
 
   useEffect(() => {
-    rainChkgdn.isSttn = false;
-    rswtChkgdn.isSttn = false;
+    //rainChkgdn.isSttn = false;
+    //rswtChkgdn.isSttn = false;
     if (!rainChkgdn.isSttn && !rswtChkgdn.isSttn) {
       rainChkHeadChange({ rainChkgdn }, true);
       rswtChkHeadChange({ rswtChkgdn }, true);
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
index 5754c02fc..58e8d6bf0 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
@@ -94,15 +94,15 @@ export const excelToRainChkData = (excelData: any, year: string) => {
       }
       const makeGuidDetail = Array.from({ length: 12 }, (_, i) => {
         let month = `${i + 1}`;
-        const splyData = item[`보급_${month}월`];
+        const splyData = item[`대체_${month}월`];
         const ruseData = item[`빗물_${month}월`];
         if (month.length < 2) month = "0" + month;
         return {
           utztnUsgCd: item["이용용도"],
           ym: year + month,
           chckYmd: checkYmd,
-          splyUswtrUtztnQnt: Number(splyData ?? 0),
-          ruseFcltUtztnQnt: Number(ruseData ?? 0),
+          splyUswtrUtztnQnt: Number(splyData) || 0,
+          ruseFcltUtztnQnt: Number(ruseData) || 0,
           flg: "RNB",
         };
       });
@@ -120,13 +120,13 @@ export const excelToRainChkData = (excelData: any, year: string) => {
         rainyDetails: [
           {
             utztnUsgCd: item["이용용도"] ?? "",
-            ph: Number(item["PH"] ?? 0),
-            trbt: Number(item["탁도"] ?? 0),
-            grssClfg: Number(item["총대장균군수"] ?? 0),
-            etc: item["기타"] ?? "", // 필드 누락 방지
-            vltnDt: vltnDt ?? "",
-            vltnMttr: item["위반사항"] ?? "",
-            levyAmt: Number(item["과태료부과금액(천원)"] ?? 0),
+            ph: Number(item["PH"] || 0),
+            trbt: Number(item["탁도"] || 0),
+            grssClfg: Number(item["총대장균군수"] || 0),
+            etc: item["기타"] || "", // 필드 누락 방지
+            vltnDt: vltnDt || "-",
+            vltnMttr: item["위반사항"] || "-",
+            levyAmt: Number(item["과태료부과금액(천원)"] || 0),
             rgtr: TEST_UUID,
           },
         ],
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 4af27a51c..4c7f2d514 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -1,7 +1,5 @@
 import { buildingType } from "@/app/store/common/code";
-import {
-  TEST_UUID,
-} from "@/app/store/ruseFcltMng/fcltReg/rainReg";
+import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   deleteFectch,
   fetchType,
@@ -22,6 +20,7 @@ import {
   type chHeadType,
 } from "./headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import toast from "react-hot-toast";
 
 export type rainChkZodType = z.infer<typeof rainChkZod>;
 const fcltDiv = [
@@ -52,7 +51,12 @@ export type rainChkgdnState = {
 };
 
 type rainChkgdnActions = {
-  rainChkInit: (pageNo: string, cnt: string, sggCd: string, searchTxt: string) => void;
+  rainChkInit: (
+    pageNo: string,
+    cnt: string,
+    sggCd: string,
+    searchTxt: string
+  ) => void;
   rainChkDetilUpdate(rainChk: rainChkZodType[]): Promise<void>;
   rainChkGuidUpdate(rainChk: rainChkZodType): Promise<void>;
   rainChkExcelDownload(
@@ -98,11 +102,20 @@ const makeMdfrChk = (data: rainChkZodType[], type: string, toDo: string) => {
   return chData;
 };
 
-const initFetch = async (pageNo: string, cnt: string, txt: string | undefined, sgg: string | undefined) => {
+const initFetch = async (
+  pageNo: string,
+  cnt: string,
+  txt: string | undefined,
+  sgg: string | undefined
+) => {
   const currentYear = new Date().getFullYear().toString();
   const rainRes = await getFetch(
     "wr",
-    `/reuseChk/rainy` + (pageNo ? `/${pageNo}` : "/1") + (cnt ? `/${cnt}` : "/20") + (txt ? `/${txt}` : `/${currentYear}`) + (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/rainy` +
+      (pageNo ? `/${pageNo}` : "/1") +
+      (cnt ? `/${cnt}` : "/20") +
+      (txt ? `/${txt}` : `/${currentYear}`) +
+      (sgg ? `/${sgg}` : "/0")
   );
   return rainRes;
 };
@@ -131,32 +144,31 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
     rainChkExcelDataUPload: async (excelData: rainChkZodType[]) => {
       try {
         const res = await postFectch("/reuseChk/rainy", excelData);
-        console.log("res", res);
-        console.log("res.ok", res.ok)
-        if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 등록이 완료되었습니다. ",
-            title: "지도점검 등록",
-          });
+        if (res.status === 200) {
+          const currentYear = new Date().getFullYear().toString();
+          const rainChkRes = await initFetch("1", "20", currentYear, "0");
+          return set((state: rainChkgdnState) => ({
+            ...state,
+            rainChkgdn: {
+              ...state.rainChkgdn,
+              rainChk: rainChkRes,
+            },
+          }));
+          toast.success("지도점검 등록이 완료되었습니다.");
+        } else {
+          toast.error("지도점검 등록이 실패되었습니다.");
         }
-        const currentYear = new Date().getFullYear().toString();
-        const rainChkRes = await initFetch("1", "20", currentYear, "0");
-        return set((state: rainChkgdnState) => ({
-          ...state,
-          rainChkgdn: {
-            ...state.rainChkgdn,
-            rainChk: rainChkRes,
-          },
-        }));
       } catch (error) {
         console.log(error);
-        ToastFormUi({
-          body: "지도점검 등록이 실패되었습니다.",
-          title: "지도점검 등록",
-        });
+        toast.error("지도점검 등록이 실패되었습니다.");
       }
     },
-    rainChkInit: async (pageNo: string, cnt: string, searchTxt: string, sggCd: string) => {
+    rainChkInit: async (
+      pageNo: string,
+      cnt: string,
+      searchTxt: string,
+      sggCd: string
+    ) => {
       try {
         const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
@@ -176,47 +188,49 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         const chData = await makeMdfrChk(rainChk, "rain", "rainDetil");
 
         const res = await postFectch("/reuseChk/rainy", chData);
-        if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 보급수 및 밋물이용량 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+        if (res.staus === 200) {
+          toast.success(
+            "지도점검 보급수 및 밋물이용량 수정이 완료되었습니다. "
+          );
+          const currentYear = new Date().getFullYear().toString();
+          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          return set((state: rainChkgdnState) => ({
+            ...state,
+            rainChkgdn: {
+              ...state.rainChkgdn,
+              rainChk: rainChkRes,
+            },
+          }));
+        } else {
+          toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
         }
-        const currentYear = new Date().getFullYear().toString();
-        const rainChkRes = await initFetch(currentYear, "0");
-        return set((state: rainChkgdnState) => ({
-          ...state,
-          rainChkgdn: {
-            ...state.rainChkgdn,
-            rainChk: rainChkRes,
-          },
-        }));
       } catch (error) {
         console.log(error);
-        alert("수정에 실패하였습니다.");
+        toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
       }
     },
     rainChkGuidUpdate: async (rainChk: rainChkZodType) => {
       try {
         //const chData = await makeMdfrChk(rainChk, "guideDetails", "rainDetil");
         const res = await putFectch("/reuseChk/rainy", rainChk);
-        if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 수질 및 과태료 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+        if (res.status === 200) {
+          toast.success("지도점검 수질 및 과태료 수정이 완료되었습니다. ");
+
+          const currentYear = new Date().getFullYear().toString();
+          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          return set((state: rainChkgdnState) => ({
+            ...state,
+            rainChkgdn: {
+              ...state.rainChkgdn,
+              rainChk: rainChkRes,
+            },
+          }));
+        }else{
+          toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
+
         }
-        const currentYear = new Date().getFullYear().toString();
-        const rainChkRes = await initFetch(currentYear, "0");
-        return set((state: rainChkgdnState) => ({
-          ...state,
-          rainChkgdn: {
-            ...state.rainChkgdn,
-            rainChk: rainChkRes,
-          },
-        }));
       } catch (error) {
-        console.log(error);
+        toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
       }
     },
     rainChkDelete: async (chkgdnPks: number[]) => {
@@ -224,22 +238,23 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         const res = await deleteFectch(`/reuseChk/rainy`, chkgdnPks);
 
         if (res) {
-          ToastFormUi({
-            body: "삭제가 완료되었습니다. ",
-            title: "지도점검 삭제",
-          });
+          toast.success("삭제가 완료되었습니다. ");
+
+          const currentYear = new Date().getFullYear().toString();
+          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          return set((state: rainChkgdnState) => ({
+            ...state,
+            rainChkgdn: {
+              ...state.rainChkgdn,
+              rainChk: rainChkRes,
+            },
+          }));
+        }else{
+          toast.error("삭제시 오류가 발생하였습니다.. ");
+
         }
-        const currentYear = new Date().getFullYear().toString();
-        const rainChkRes = await initFetch(currentYear, "0");
-        return set((state: rainChkgdnState) => ({
-          ...state,
-          rainChkgdn: {
-            ...state.rainChkgdn,
-            rainChk: rainChkRes,
-          },
-        }));
       } catch (error) {
-        ToastFormUi({ body: "삭제를 실패했습니다.. ", title: "지도점검 삭제" });
+        toast.error("삭제시 오류가 발생하였습니다.. ");
       }
     },
     rainChkHeadChange: async (rainChkgdn: rainChkgdnState, isEdit: boolean) => {
@@ -249,16 +264,13 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         const ruseHeadList = rainChkgdn.rainChkgdn.ruseHeadList;
 
         rainChkgdnHeadList.forEach((head) => {
-          if (head.edit !== undefined)
-            head.edit = isEdit;
+          if (head.edit !== undefined) head.edit = isEdit;
         });
         splHeadList.forEach((head) => {
-          if (head.edit !== undefined)
-            head.edit = isEdit;
+          if (head.edit !== undefined) head.edit = isEdit;
         });
         ruseHeadList.forEach((head) => {
-          if (head.edit !== undefined)
-            head.edit = isEdit;
+          if (head.edit !== undefined) head.edit = isEdit;
         });
 
         return set((state: rainChkgdnState) => ({
@@ -267,7 +279,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
             ...state.rainChkgdn,
             rainChkgdnHeadList: rainChkgdnHeadList,
             splHeadList: splHeadList,
-            ruseHeadList: ruseHeadList
+            ruseHeadList: ruseHeadList,
           },
         }));
       } catch (error) {
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx
index f112db0bd..8c90e0829 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/headList.tsx
@@ -11,7 +11,7 @@ export const rainChkgdnHeadSttnExport: TableUpperProps[] = [
   { id: "dtfcltCpct", title: "빗물저류조용량(m³)", mergeCell: true },
   { id: "chckYmd", title: "점검일", mergeCell: true },
   { id: "utztnUsgCd", title: "이용용도" },
-  { id: "totalSplyUswtrUtztnQnt", title: "연간보급수이용량(m³)" },
+  { id: "totalSplyUswtrUtztnQnt", title: "연간대체수이용량(m³)" },
   { id: "totalRuseFcltUtztnQnt", title: "연간빗물이용량(m³)" },
   {
     id: "ph",
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index ea3f58a40..2136dfebe 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -1,11 +1,10 @@
 import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import { type TableUpperProps } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import { getFetch } from "@/components/lib/api";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import type { SelectDataType } from "@common/business_components/ui";
 import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
 import { rainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { buildingExcelRainSttn } from "./excel";
+import type { TableUpperProps } from "@/app/store/common/type/header";
 
 const fcltDiv = [
   { val: "RST", text: "중수도시설" },
diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx
index 9ac26827d..7a35e02c4 100644
--- a/apps/wr/components/lib/func/TableData.tsx
+++ b/apps/wr/components/lib/func/TableData.tsx
@@ -103,6 +103,7 @@ export const chRowspanTable = (
               const key = head.id;
               const isMerged = head.mergeCell;
               const value = row[key];
+
               // 병합 대상이면 중복 렌더링 여부 판단
               if (isMerged) {
                 const renderedSet = renderedMap.get(key) ?? new Set<number>();
@@ -152,7 +153,7 @@ export const chRowspanTable = (
                       onChange={(e) => {
                         handleChange(rowIndex, head.id, e.target.value);
                       }}
-                      value={value ?? ""}
+                      value={value || ""}
                       disabled={!selectedIds.includes(row.chkgdnPk)}
                     />
                   ) : (
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
index 15badc59d..8828420b8 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
@@ -1,7 +1,7 @@
 import { useWrStore } from "@/app/store";
 import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import { excelToRainChkData } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel";
-import  { chkgdRegExcel } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
+import { chkgdRegExcel } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { rswtChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import {
   excelToRswtGuideData,
@@ -18,24 +18,31 @@ import {
   SelectBox,
   Title,
 } from "@common/business_components/ui";
+import { Card } from "@common/business_components/ui/chart/lib/card";
 import { Button, Input } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import toast from "react-hot-toast";
 import type { z } from "zod";
 
 export default function ChkgdExcel({ type }: { type: string }) {
-  const {
-    rswtChkgdn,
-    rainChkExcelDataUPload,
-    rswtChkExceDataUpload,
-  } = useWrStore((state) => {
-    return state;
-  });
-  const [files, setFiles] = useState<File[] | null>(null);
+  const { rswtChkgdn, rainChkExcelDataUPload, rswtChkExceDataUpload } =
+    useWrStore((state) => {
+      return state;
+    });
   const [excelData, setExcelData] = useState<
     rswtChkZodType[] | rainChkZodType[]
   >();
+
+  const [file, setFile] = useState<File | null>(null);
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const selectedFile = e.target.files?.[0];
+    if (selectedFile) {
+      setFile(selectedFile);
+    }
+  };
   const [excelRswtData, setExcelRswtData] = useState<rswtChkZodType[]>();
 
   const currentYear = new Date().getFullYear();
@@ -49,7 +56,7 @@ export default function ChkgdExcel({ type }: { type: string }) {
   );
 
   const defaultValues: z.infer<typeof chkgdRegExcel> = chkgdRegExcel.parse({
-    chckYr: String(currentYear)
+    chckYr: String(currentYear),
   });
 
   const form = useForm<z.infer<typeof chkgdRegExcel>>({
@@ -58,14 +65,10 @@ export default function ChkgdExcel({ type }: { type: string }) {
   });
 
   useEffect(() => {
-    if (files) {
-      const file = files[0];
+    if (file) {
       if (form.getValues("chckYr").length < 1) {
-        ToastFormUi({
-          body: "파일업로드 이전에 등록년도를 작성해주세요 ",
-          title: "지도점검 등록",
-        });
-        setFiles(null);
+        toast.error("파일업로드 이전에 등록년도를 작성해주세요 ");
+        setFile(null);
         return;
       }
       if (file)
@@ -87,7 +90,6 @@ export default function ChkgdExcel({ type }: { type: string }) {
                 form.getValues("chckYr")
               );
 
-
               const keyGenerator = (item: rswtChkZodType) =>
                 `${item.bdstRuseFcltFk}|${item.chckYmd}|${item.utztnUsgCd}`;
               const totalData: rswtChkZodType[] = guideData.map((guide) => {
@@ -98,12 +100,11 @@ export default function ChkgdExcel({ type }: { type: string }) {
                     guide.utztnUsgCd === polution.utztnUsgCd
                 );
 
-                
                 if (fusion) {
                   return {
                     ...guide,
                     rswtrPollutions: fusion?.rswtrPollutions,
-                    rswtrDetails:fusion?.rswtrDetails
+                    rswtrDetails: fusion?.rswtrDetails,
                   };
                 } else {
                   return {
@@ -118,19 +119,17 @@ export default function ChkgdExcel({ type }: { type: string }) {
                 (item) => !guideKey.has(keyGenerator(item))
               );
 
+              const listTotalData: rswtChkZodType[] = [
+                ...totalData,
+                ...onlypolution,
+              ];
 
-             const listTotalData:rswtChkZodType[] =[
-              ...totalData,
-              ...onlypolution
-             ]
-
-
-           setExcelRswtData(listTotalData);
+              setExcelRswtData(listTotalData);
             }
           });
         }
     }
-  }, [files]);
+  }, [file]);
 
   function findMatchingItems<T>(
     arrayA: T[],
@@ -144,7 +143,6 @@ export default function ChkgdExcel({ type }: { type: string }) {
         (!condition || condition(item)) && bKeySet.has(keySelector(item))
     );
   }
-  
 
   const onSubmit = (values: z.infer<typeof chkgdRegExcel>) => {
     if (values.chckYr === "") {
@@ -160,7 +158,6 @@ export default function ChkgdExcel({ type }: { type: string }) {
         });
         return;
       } else {
-
         rainChkExcelDataUPload(excelData as rainChkZodType[]);
       }
     } else if (type === "RST") {
@@ -223,13 +220,13 @@ export default function ChkgdExcel({ type }: { type: string }) {
                 name="file"
                 render={({ field }) => (
                   <FormUi label="점검결과 파일">
-                    <FileUpload
-                      files={files || []}
-                      setFiles={(files: File[] | null) => {
-                        if (files) setFiles(files);
-                      }}
-                      fileTypes="xlsx"
-                    ></FileUpload>
+                    <div className="space-y-4 p-4">
+                      <Input
+                        type="file"
+                        onChange={handleFileChange}
+                        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                        />
+                    </div>
                   </FormUi>
                 )}
               />
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
index 4e3d61008..965bc7275 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
@@ -39,7 +39,6 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
     "4": [] as z.infer<typeof rswtrPolutionsZode>[],
   });
 
-  const { rainChk, ruseHeadList, splHeadList } = rainChkgdn;
   const [updateData, setUpdateData] = useState<splRuseWaterType[]>();
 
   const initStats = (): z.infer<typeof rswtrPolutionsZode> => ({
@@ -97,7 +96,6 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
         target = { utztnUsgCd: code, ruseTotal: 0, splTotal: 0 };
         acc.push(target);
       }
-
       // 월별 값 누적
       target[ruseMonthKey] = (target[ruseMonthKey] ?? 0) + ruseValue;
       target[splMonthKey] = (target[splMonthKey] ?? 0) + splValue;
@@ -106,7 +104,18 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
       target.splTotal += splValue;
       return acc;
     }, []);
-    setGuidData(result);
+
+    if (result) {
+      // '기타' 항목을 배열의 맨 뒤로 정렬합니다.
+      result.sort((a: splRuseWaterType, b: splRuseWaterType) => {
+        if (a.utztnUsgCd === "기타") return 1; // a를 b 뒤로 보냅니다.
+        if (b.utztnUsgCd === "기타") return -1; // b를 a 뒤로 보냅니다.
+        return 0; // 순서를 유지합니다.
+      });
+    }
+
+    console.log("result  ", result);
+    setGuidData(result as splRuseWaterType[]);
 
     if (obj.rswtrPollutions) {
       const resultPolution: Record<string, any[]> = {
@@ -159,6 +168,14 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
         if (!resultPolution[nodeKey]) {
           resultPolution[nodeKey] = [];
         }
+
+        // '기타' 항목을 배열의 맨 뒤로 정렬합니다.
+        resultPolution[nodeKey].sort((a: any, b: any) => {
+          if (a.utztnUsgCd === "기타") return 1; // a를 b 뒤로 보냅니다.
+          if (b.utztnUsgCd === "기타") return -1; // b를 a 뒤로 보냅니다.
+          return 0; // 순서를 유지합니다.
+        });
+
         resultPolution[nodeKey].push(average);
       });
 
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index 5166b461f..720a73ab4 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -70,10 +70,15 @@ export default function RainChkgdTable({
   }, [makeTableData, handleClick]);
 
 
+  useEffect(() =>{
+
+
+  },[rainChkgdn.rainChk])
 
   useEffect(() => {
     setSelectedIds([])// 셀렉트 초기화를 위한 작업
     if (rainChkData) {
+
       const rainChg = rainChkData.map((item: any) => {
         const bud = tableData([item.building], { code });
         return {
@@ -82,6 +87,7 @@ export default function RainChkgdTable({
           rowspan: item.rainyDetails?.length,
         };
       });
+
       setMakeTableData(rainChkTableData(rainChg));
     }
   }, [rainChkData, code]);
@@ -106,7 +112,6 @@ export default function RainChkgdTable({
               );
 
               if (findRain != undefined) {
-                console.log(findRain)
                 return {
                   ...rd,
                   ph: Number(findRain.ph),
diff --git a/apps/wr/public/sample_rainy.xlsx b/apps/wr/public/sample_rainy.xlsx
index 73a52d89c3472af48a29d34e8e4edd82fbfbeacc..ec7577c510bf5ffefdbf146c56ac3d6569ce5b0b 100644
GIT binary patch
delta 5270
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
XK18qq0E&M}4Z{j~A7h7b{SE#X5%d0-

delta 5239
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


From 31140ea19046ab6e5d95cf223de149da7593fdfb Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Wed, 2 Jul 2025 20:19:48 +0900
Subject: [PATCH 16/44] =?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=ED=98=84=ED=99=A9=20=EA=B2=B0?=
 =?UTF-8?q?=ED=95=A8=EB=8C=80=EC=9E=A5=20=EC=98=A4=EB=A5=98=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

---
 .../ruseFcltMng/fcltSttn/rainSttn/page.tsx    | 149 ++++++++++++++++--
 .../fcltSttn/rainSttn/headList.tsx            |   8 +-
 .../ruseFcltMng/fcltSttn/rainSttn/index.tsx   |   3 +
 .../sttn/pbnstSttnModal/pbnstSttnModal.tsx    | 133 ++++++++--------
 4 files changed, 213 insertions(+), 80 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
index f101be91b..7e068bcd0 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
@@ -4,6 +4,7 @@ import { useWrStore } from "@/app/store";
 import { btnClass } from "@/app/store/common/code";
 import {
   excelDownload,
+  getCity,
   getCityOrSgg,
   tableData,
 } from "@/components/lib/func/commom";
@@ -11,10 +12,16 @@ import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal";
 import {
   ContentsDiv,
   SearchBaseForm,
+  SearchDiv,
+  SearchFormLeft,
+  SearchFormRight,
+  SearchInput,
+  SelectBox,
   Title,
   UiModal,
   UiTable,
   type ReturnType,
+  type SelectDataType,
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components/ui";
@@ -26,6 +33,7 @@ import type {
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
 import SttnDetailModal from "@/components/ui/modal/sttn/sttnDetailModal/sttnDetailModal";
 import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal";
+import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 
 export default function RainSttn() {
   const { code, rainSttn, rainSttnSearch, rainSttnInit } = useWrStore(
@@ -37,6 +45,8 @@ export default function RainSttn() {
   const [pageNation, setPageNation] = useState(1);
   const [isChHead, setIsChHead] = useState(false);
   const [bdstTable, setBdstTable] = useState<customRainBdst[]>();
+  const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
+  const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
   const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRainBdst | undefined }>({ data: undefined, isOpen: false })
   const [bdstChgProps, setBdstChgProps] = useState<{
     isOpen: boolean;
@@ -56,6 +66,38 @@ export default function RainSttn() {
     }
   };
 
+  const getSelCity = (val: string | number) => {
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      const firstSggVal = data.find(item => item.val === "0")?.val || (data[0]?.val ?? "");
+      setObjSearch({ city: cityValue, sgg: firstSggVal });
+    }
+  };
+
+  const getSgg = (val: string | number) => {
+    console.log("val", val)
+    setObjSearch({ ...objSearch, sgg: String(val) })
+  };
+
+  const getConValue = () => {
+    if (!objSearch.city || objSearch.city === "0") {
+      return "0";
+    }
+    if (objSearch.sgg && objSearch.sgg !== "0") {
+      return objSearch.sgg;
+    }
+    return objSearch.city;
+  };
+
+
+
   useEffect(() => {
     if (!rainSttn.isInit) {
       rainSttnInit(codeData ?? "0");
@@ -63,19 +105,30 @@ export default function RainSttn() {
   }, [rainSttn.isInit, rainSttnInit]);
 
   useEffect(() => {
-    if (rainSttnRes.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(rainSttnRes, { code });
-      const chData = data
-        .map((item: any) => ({
+    const data = tableData(rainSttnRes, { code });
+    const chData = data
+      .map((item: any) => {
+        console.log("item", item);
+        console.log("왜안돼", item.reuseBuilding[0].rainyObj.dtfcltCpct)
+        return {
           ...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,
           chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N",
-        }))
-        .filter((item: any) => item.rainyObj !== undefined);
-
-      setBdstTable(chData);
-    }
+        };
+      })
+      .filter((item: any) => item.rainyObj !== undefined);
+    console.log("chData", chData)
+    setBdstTable(chData);
   }, [code, rainSttnRes, rainSttn.rainSttHeadList]);
 
   useEffect(() => {
@@ -94,9 +147,14 @@ export default function RainSttn() {
     }
   }, [rainSttn.excelList]);
 
+  // const excelClick = useCallback(() => {
+  //   if (codeData) rainSttnSearch(1, "10000", codeData, code.cityCd, code.sggCd);
+  // }, [rainSttnSearch, codeData, code.cityCd, code.sggCd]);
   const excelClick = useCallback(() => {
-    if (codeData) rainSttnSearch(1, "10000", codeData, code.cityCd, code.sggCd);
-  }, [rainSttnSearch, codeData, code.cityCd, code.sggCd]);
+    // 최신 검색 조건 반영
+    const con = getConValue();
+    rainSttnSearch(1, "10000", String(con), code.cityCd, code.sggCd);
+  }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   return (
     <>
@@ -104,7 +162,70 @@ export default function RainSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"빗물재이용 시설 현황"} />
-            <SearchBaseForm
+
+
+            <SearchDiv>
+              <SearchFormLeft>
+                <div className="col-span-10 flex flex-row">
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl"
+                    label="시도"
+                    selectClass={""}
+                    selectArray={code.cityCd}
+                    onSelectValue={getSelCity}
+                  />
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl ml-4"
+                    label="시군구"
+                    selectClass={""}
+                    selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
+                    onSelectValue={getSgg}
+                  />
+                </div>
+              </SearchFormLeft>
+              <SearchFormRight
+                className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
+                    size={"sm"}
+                    onClick={() => {
+                      const con = getConValue();
+                      rainSttnSearch(1, "20", String(con), code.cityCd, code.sggCd);
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={`${btnClass} green`}
+                    onClick={excelClick}
+                  >
+                    다운로드
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={btnClass}
+                    onClick={() => {
+                      setIsChHead(true);
+                    }}
+                  >
+                    조회항목설정
+                  </Button>
+                </div>
+              </SearchFormRight>
+            </SearchDiv>
+
+
+
+
+
+
+
+
+
+
+            {/* <SearchBaseForm
               selectSidoData={code.cityCd}
               selectSigunData={code.sggCd}
               selectRegionData={code.rvbsnCd}
@@ -137,14 +258,14 @@ export default function RainSttn() {
               btnClass={btnClass}
               ref={ref}
               isAdmin={false}
-            />
+            /> */}
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
           <div className="col-span-6">
             <ListDiv>
               <UiTable
-                headName={[]}
+                headName={undefined}
                 tableData={bdstTable || []}
                 children={
                   <HeadMakeColSpan upHeadList={rainSttn.rainSttNodeList} />
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
index 7db00678d..8dd2a4d6f 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
@@ -31,8 +31,8 @@ export const rainSttHeadListExport: z.infer<typeof sttnHeadListType> = [
     visible: true,
   },
   {
-    id: "bdstUsgCd",
-    title: "건축물용도코드",
+    id: "bdsgUsgText",
+    title: "건축물용도",
     visible: true,
   },
   {
@@ -209,8 +209,8 @@ export const rainSttNodeListExport: CommonTableProps[] = [
     colSpan: 1,
   },
   {
-    id: "bdstUsgCd",
-    title: "건축물용도코드",
+    id: "bdsgUsgText",
+    title: "건축물용도",
     upName: "bdnstInfo",
     visible: true,
     row: 2,
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
index 5aa54ee48..42d158d4e 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
@@ -153,10 +153,13 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
           sidoCode: SelectDataType[],
           sggCode: SelectDataType[]) => {
       try {
+        let a = `/reuseFc/rainyInfoList/${page}/${total}/${con}`
+        console.log("주소", a)
         const rainSttnRes = await getFetch(
           fetchType.WR,
           `/reuseFc/rainyInfoList/${page}/${total}/${con}`
         );
+        console.log("rainSttnRes", rainSttnRes)
         if (Number(total) > 9000) {
           const rainExcel = excelRainSttnParsing(rainSttnRes, sidoCode, sggCode);
           set((state: rainSttnState) => {
diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
index f4a3735a5..cec8babd0 100644
--- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
+++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx
@@ -13,6 +13,7 @@ import {
   type customPbnst,
   type fcBizType,
 } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
+import { formH1Class } from "@/components/lib/class/comClass";
 import { PbnstMngForm } from "@/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm";
 import { ScrollArea, Title, UiTable } from "@common/business_components/ui";
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
@@ -31,7 +32,7 @@ import { z } from "zod";
 export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titleVisible?: boolean }) {
   const { code, pbnstSttn, prfmnc } = useWrStore((state) => state);
   const [fcltTab, setFcltTab] = useState<string>("fclt");
-  const [ruseTab, setRuseTab] = useState<string>("inoutTotal");
+  const [ruseTab, setRuseTab] = useState<string>("totalPrf");
   const [ruseBizData, setRuseBizData] = useState<{
     data: any[];
     head: TableUpperProps[];
@@ -229,7 +230,8 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
         (item) => item.pbnstRuseFcltPk === data.pbnstRuseFcltPk
       )?.prfList;
 
-      if (prfList) {console.log("prfList", prfList);
+      if (prfList) {
+        console.log("prfList", prfList);
 
         getTablePrfData(prfList);
       }
@@ -243,12 +245,12 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
       form.reset({ items: [data] })
     }
 
-  },[data, form])
+  }, [data, form])
 
 
-  useEffect(()=>{
+  useEffect(() => {
     console.log("prfData", prfData);
-  },[prfData])
+  }, [prfData])
   return (
     <>
       <div>
@@ -264,72 +266,79 @@ export function PbnstSttnModal({ data, titleVisible }: { data: customPbnst; titl
             indexMng={indexMng}
             setIndexMng={setIndexMng}
           />
-          <Tabs defaultValue="fclt" onValueChange={setFcltTab}>
-            <TabsList className="">
-              <TabsTrigger className="!text-xl" value="fclt">
-                하수처리수 재이용시설 현황
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="sply">
-                재이용 원수 취수 현황
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="ppi">
-                재이용 공급관로 현황
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="guarantee">
-                재이용 보증수질 현황
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="dmdCo">
-                재이용 수요처 현황
-              </TabsTrigger>
-            </TabsList>
-            <TabsContent className="max-h-full" value={fcltTab}>
-              <UiTable
-                headName={undefined}
-                tableData={ruseTableData || []}
-                headlist={ruseHeadList || []}
-                pageSize={0}
-                total={0}
-                cellClick={undefined}
-                onPageChange={function (page: number): void {
-                  throw new Error("Function not implemented.");
-                }}
-                children={
-                  fcltTab === "fclt" ? (
-                    <HeadMakeColSpan upHeadList={pbnstSttn.ruseFcltNodeList} />
-                  ) : undefined
-                }
-              ></UiTable>
-            </TabsContent>
-          </Tabs>
-
-          <Tabs  onValueChange={setRuseTab}>
-            <TabsList className="">
-              <TabsTrigger className="!text-xl" value="totalPrf">
-                장내외합계
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="inPrf">
-                장내용수
-              </TabsTrigger>
-              <TabsTrigger className="!text-xl" value="outPrf">
-                장외용수
-              </TabsTrigger>
-            </TabsList>
-            <TabsContent className="max-h-full" value={ruseTab}>
-              {prfData && (
+          <div className="px-6">
+            <div className="">
+              <h1 className={formH1Class}>하수재이용시설 현황</h1>
+            </div>
+            <Tabs defaultValue="fclt" onValueChange={setFcltTab}>
+              <TabsList className="mt-4">
+                <TabsTrigger className="!text-xl" value="fclt">
+                  하수처리수 재이용시설 현황
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="sply">
+                  재이용 원수 취수 현황
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="ppi">
+                  재이용 공급관로 현황
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="guarantee">
+                  재이용 보증수질 현황
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="dmdCo">
+                  재이용 수요처 현황
+                </TabsTrigger>
+              </TabsList>
+              <TabsContent className="max-h-full" value={fcltTab}>
                 <UiTable
                   headName={undefined}
-                  tableData={prfData[ruseTab as keyof typeof prfData] || []}
-                  headlist={monthHeadList || []}
+                  tableData={ruseTableData || []}
+                  headlist={ruseHeadList || []}
                   pageSize={0}
                   total={0}
                   cellClick={undefined}
                   onPageChange={function (page: number): void {
                     throw new Error("Function not implemented.");
                   }}
+                  children={
+                    fcltTab === "fclt" ? (
+                      <HeadMakeColSpan upHeadList={pbnstSttn.ruseFcltNodeList} />
+                    ) : undefined
+                  }
                 ></UiTable>
-              )}
-            </TabsContent>
-          </Tabs>
+              </TabsContent>
+            </Tabs>
+            <div className="">
+              <h1 className={formH1Class}>하수재이용실적</h1>
+            </div>
+            <Tabs defaultValue="totalPrf" onValueChange={setRuseTab}>
+              <TabsList className="mt-4">
+                <TabsTrigger className="!text-xl" value="totalPrf">
+                  장내외합계
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="inPrf">
+                  장내용수
+                </TabsTrigger>
+                <TabsTrigger className="!text-xl" value="outPrf">
+                  장외용수
+                </TabsTrigger>
+              </TabsList>
+              <TabsContent className="max-h-full" value={ruseTab}>
+                {prfData && (
+                  <UiTable
+                    headName={undefined}
+                    tableData={prfData[ruseTab as keyof typeof prfData] || []}
+                    headlist={monthHeadList || []}
+                    pageSize={0}
+                    total={0}
+                    cellClick={undefined}
+                    onPageChange={function (page: number): void {
+                      throw new Error("Function not implemented.");
+                    }}
+                  ></UiTable>
+                )}
+              </TabsContent>
+            </Tabs>
+          </div>
         </ScrollArea>
       </div>
     </>

From 915b6573579e3fcf3ad36859b1670cc5733cbd43 Mon Sep 17 00:00:00 2001
From: YangJinSoo94 <jschrome782@gmail.com>
Date: Thu, 3 Jul 2025 09:41:38 +0900
Subject: [PATCH 17/44] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=82=AC=EB=A1=80=EA=B4=80=EB=A6=AC=20=EC=96=91=EC=8B=9D?=
 =?UTF-8?q?=EC=97=90=20=EC=9E=91=EC=84=B1=EB=B0=A9=EB=B2=95=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/public/sample_ruseCaseMng.xlsx | Bin 19429 -> 20324 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/apps/wr/public/sample_ruseCaseMng.xlsx b/apps/wr/public/sample_ruseCaseMng.xlsx
index 3a88e0623e067d483927ce6dfdc452c2dbb2ee19..96027d557fe2cfc60d3de10c313c49d78f984591 100644
GIT binary patch
delta 12615
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
LHo2<&Yxe&D6inE*

delta 11787
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
b@&5KfxHLpqnF0q3gau-}y;%J6?&|*mOKXGP


From 1f2316d8b4bc5ba23fbff224833aef0b19ed82c3 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Thu, 3 Jul 2025 10:50:02 +0900
Subject: [PATCH 18/44] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84/=EC=98=A8?=
 =?UTF-8?q?=EB=B0=B0=EC=88=98=EC=8B=9C=EC=84=A4=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EB=B3=80=EA=B2=BD,=20-1?=
 =?UTF-8?q?=EA=B0=92=20=ED=99=95=EC=9D=B8=EB=B6=88=EA=B0=80=EB=A1=9C=20?=
 =?UTF-8?q?=ED=91=9C=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/fcltSttn/htdflSttn/page.tsx   | 176 ++++++++++++------
 .../ruseFcltMng/fcltSttn/rainSttn/page.tsx    |  62 +-----
 .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx    | 155 ++++++++++-----
 .../ruseFcltMng/fcltSttn/htdflSttn/index.tsx  |  16 +-
 4 files changed, 242 insertions(+), 167 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
index e43d5b04f..03b549270 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
@@ -8,6 +8,7 @@ import type {
 } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   excelDownload,
+  getCity,
   getCityOrSgg,
   tableData,
 } from "@/components/lib/func/commom";
@@ -16,16 +17,22 @@ import SttnDetailModal from "@/components/ui/modal/sttn/sttnDetailModal/sttnDeta
 import {
   ContentsDiv,
   SearchBaseForm,
+  SearchDiv,
+  SearchFormLeft,
+  SearchFormRight,
+  SelectBox,
   Title,
   UiModal,
   UiTable,
   type ReturnType,
+  type SelectDataType,
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { excelHtdflSttnParsing } from "@/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel";
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
+import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 
 export default function HtdflSttn() {
   const { code, htdflSttn, htdflSttnSearch, initHtdfl } = useWrStore(
@@ -38,6 +45,8 @@ export default function HtdflSttn() {
   const [pageNation, setPageNation] = useState(1);
   const [isChHead, setIsChHead] = useState(false);
   const [bdstTable, setBdstTable] = useState<customRainBdst[]>();
+  const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
+  const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
   const [detailModal, setDetailModal] = useState<{
     isOpen: boolean;
     data: customRainBdst | undefined;
@@ -50,13 +59,44 @@ export default function HtdflSttn() {
   const codeData = getCityOrSgg(ref);
 
   const excelClick = useCallback(() => {
-    if (codeData) htdflSttnSearch(1, "10000", codeData);
-  }, [htdflSttnSearch, codeData]);
+    // 최신 검색 조건 반영
+    const con = getConValue();
+    htdflSttnSearch(1, "10000", String(con), code.cityCd, code.sggCd);
+  }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   useEffect(() => {
-    if (codeData != null) htdflSttnSearch(pageNation, "20", codeData);
+    if (codeData != null) htdflSttnSearch(pageNation, "20", codeData, code.cityCd, code.sggCd);
   }, [pageNation]);
 
+  const getSelCity = (val: string | number) => {
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      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) })
+  };
+
+  const getConValue = () => {
+    if (!objSearch.city || objSearch.city === "0") {
+      return "0";
+    }
+    if (objSearch.sgg && objSearch.sgg !== "0") {
+      return objSearch.sgg;
+    }
+    return objSearch.city;
+  };
+
   const cellClick = (index: number | undefined, headId: string) => {
     if (
       headId !== "chBuildingYn" &&
@@ -67,20 +107,15 @@ export default function HtdflSttn() {
     }
   };
   useEffect(() => {
-    const excelDown = async () => {
-      if (htdflSttn.excelList.length > 0) {
-        if (htdflSttn.excelList.length === 0) return;
-        const excelData = await tableData(htdflSttn.excelList, { code });
-        const htdflExcel = excelHtdflSttnParsing(excelData, code.cityCd, code.sggCd);
-        excelDownload(
-          htdflExcel as [[]],
-          "온배수시설 현황",
-          "sample_htdflSttn.xlsx",
-          "A1:S3"
-        );
-      }
-    };
-    excelDown();
+    if (htdflSttn.excelList.length > 0) {
+      if (htdflSttn.excelList.length === 0) return;
+      excelDownload(
+        htdflSttn.excelList,
+        "온배수시설 현황",
+        "sample_htdflSttn.xlsx",
+        "A1:S3"
+      );
+    }
   }, [htdflSttn.excelList, code]);
 
   useEffect(() => {
@@ -90,19 +125,16 @@ export default function HtdflSttn() {
   }, [htdflSttn.isInit, initHtdfl]);
 
   useEffect(() => {
-    if (htdflSttnRes.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(htdflSttnRes, { code });
-      const chData = data
-        .map((item: any) => ({
-          ...item,
-          ...item.reuseBuilding[0],
-          ...item.reuseBuilding[0].htdflObj,
-          chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N",
-        }))
-        .filter((item: any) => item.htdflObj !== undefined);
-
-      setBdstTable(chData);
-    }
+    const data = tableData(htdflSttnRes, { code });
+    const chData = data
+      .map((item: any) => ({
+        ...item,
+        ...item.reuseBuilding[0],
+        ...item.reuseBuilding[0].htdflObj,
+        chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N",
+      }))
+      .filter((item: any) => item.htdflObj !== undefined);
+    setBdstTable(chData);
   }, [code, htdflSttnRes, htdflSttn.htdflSttHeadList]);
 
   return (
@@ -111,43 +143,65 @@ export default function HtdflSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"온배수 시설 현황"} />
-            <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={<Button
-                className={btnClass}
-                onClick={() => {
-                  setIsChHead(true);
-                } }
-              >
-                조회항목설정
-              </Button>}
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                let con;
-                if (returnType.sigunValue != "0") {
-                  con = returnType.sigunValue;
-                } else {
-                  con = returnType.sidoValue;
-                }
-                 htdflSttnSearch(pageNation, "20", con);
-              } }
-              excelClick={excelClick}
-              initClick={function (): void { } }
-              btnClass={btnClass}
-              ref={ref} isAdmin={false}            />
+
+            <SearchDiv>
+              <SearchFormLeft>
+                <div className="col-span-10 flex flex-row">
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl"
+                    label="시도"
+                    selectClass={""}
+                    selectArray={code.cityCd}
+                    onSelectValue={getSelCity}
+                  />
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl ml-4"
+                    label="시군구"
+                    selectClass={""}
+                    selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
+                    onSelectValue={getSgg}
+                  />
+                </div>
+              </SearchFormLeft>
+              <SearchFormRight
+                className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
+                    size={"sm"}
+                    onClick={() => {
+                      const con = getConValue();
+                      htdflSttnSearch(1, "20", String(con), code.cityCd, code.sggCd);
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={`${btnClass} green`}
+                    onClick={excelClick}
+                  >
+                    다운로드
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={btnClass}
+                    onClick={() => {
+                      setIsChHead(true);
+                    }}
+                  >
+                    조회항목설정
+                  </Button>
+                </div>
+              </SearchFormRight>
+            </SearchDiv>
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
           <div className="col-span-6">
             <ListDiv>
               <UiTable
-                headName={[]}
+                headName={undefined}
                 tableData={bdstTable || []}
                 children={
                   <HeadMakeColSpan upHeadList={htdflSttn.htdflSttNodeList} />
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
index 7e068bcd0..804e9d808 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
@@ -82,7 +82,6 @@ export default function RainSttn() {
   };
 
   const getSgg = (val: string | number) => {
-    console.log("val", val)
     setObjSearch({ ...objSearch, sgg: String(val) })
   };
 
@@ -96,8 +95,6 @@ export default function RainSttn() {
     return objSearch.city;
   };
 
-
-
   useEffect(() => {
     if (!rainSttn.isInit) {
       rainSttnInit(codeData ?? "0");
@@ -108,8 +105,6 @@ export default function RainSttn() {
     const data = tableData(rainSttnRes, { code });
     const chData = data
       .map((item: any) => {
-        console.log("item", item);
-        console.log("왜안돼", item.reuseBuilding[0].rainyObj.dtfcltCpct)
         return {
           ...item,
           ...item.reuseBuilding[0],
@@ -124,10 +119,16 @@ export default function RainSttn() {
             ? "확인불가"
             : 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,
         };
       })
       .filter((item: any) => item.rainyObj !== undefined);
-    console.log("chData", chData)
     setBdstTable(chData);
   }, [code, rainSttnRes, rainSttn.rainSttHeadList]);
 
@@ -147,9 +148,6 @@ export default function RainSttn() {
     }
   }, [rainSttn.excelList]);
 
-  // const excelClick = useCallback(() => {
-  //   if (codeData) rainSttnSearch(1, "10000", codeData, code.cityCd, code.sggCd);
-  // }, [rainSttnSearch, codeData, code.cityCd, code.sggCd]);
   const excelClick = useCallback(() => {
     // 최신 검색 조건 반영
     const con = getConValue();
@@ -162,8 +160,6 @@ export default function RainSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"빗물재이용 시설 현황"} />
-
-
             <SearchDiv>
               <SearchFormLeft>
                 <div className="col-span-10 flex flex-row">
@@ -215,50 +211,6 @@ export default function RainSttn() {
                 </div>
               </SearchFormRight>
             </SearchDiv>
-
-
-
-
-
-
-
-
-
-
-            {/* <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={
-                <Button
-                  className={btnClass}
-                  onClick={() => {
-                    setIsChHead(true);
-                  }}
-                >
-                  조회항목설정
-                </Button>
-              }
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                let con;
-                if (returnType.sigunValue != "0") {
-                  con = returnType.sigunValue;
-                } else {
-                  con = returnType.sidoValue;
-                }
-                rainSttnSearch(1, "20", con, code.cityCd, code.sggCd);
-              }}
-              excelClick={excelClick}
-              initClick={function (): void { }}
-              btnClass={btnClass}
-              ref={ref}
-              isAdmin={false}
-            /> */}
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
index f9b3c6187..05ee774f1 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
@@ -5,19 +5,26 @@ import type { chgBuilding } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import type { customRswtBdst } from "@/app/store/ruseFcltMng/fcltReg/rswtReg";
 import {
   excelDownload,
+  getCity,
   getCityOrSgg,
   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";
 import {
   ContentsDiv,
   SearchBaseForm,
+  SearchDiv,
+  SearchFormLeft,
+  SearchFormRight,
+  SelectBox,
   Title,
   UiModal,
   UiTable,
   type ReturnType,
+  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";
@@ -34,6 +41,8 @@ export default function RswtSttn() {
   const [isChHead, setIsChHead] = useState(false);
   const ref = useRef<ReturnType>({} as ReturnType);
   const [bdstTable, setBdstTable] = useState<customRswtBdst[]>();
+  const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
+  const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
   const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRswtBdst | undefined }>({ data: undefined, isOpen: false })
   const [bdstChgProps, setBdstChgProps] = useState<{
     isOpen: boolean;
@@ -58,6 +67,35 @@ export default function RswtSttn() {
     }
   }
 
+  const getSelCity = (val: string | number) => {
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      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) })
+  };
+
+  const getConValue = () => {
+    if (!objSearch.city || objSearch.city === "0") {
+      return "0";
+    }
+    if (objSearch.sgg && objSearch.sgg !== "0") {
+      return objSearch.sgg;
+    }
+    return objSearch.city;
+  };
+
   useEffect(() => {
     if (!rswtSttn.isInit) {
       rswtSttnInit("0");
@@ -65,22 +103,25 @@ export default function RswtSttn() {
   }, [rswtSttn.isInit, rswtSttnInit]);
 
   useEffect(() => {
-    if (rswtSttnRes?.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(rswtSttnRes, { code });
-      const chData = data
-        .map((item: customRswtBdst) => ({
+    const data = tableData(rswtSttnRes, { code });
+    const chData = data
+      .map((item: customRswtBdst) => {
+        console.log("item", item)
+        return {
           ...item,
           ...item.reuseBuilding[0],
           ...item.reuseBuilding[0]?.rswtrObj,
-          chBuildingYn: item?.chgBuilding[0]?.bdstChgNm !== null && item?.chgBuilding.length > 0 ? 'Y' : 'N'
-        }))
-        .filter(
-          (item: customRswtBdst) =>
-            item.reuseBuilding[0]?.rswtrObj !== undefined
-        );
+          chBuildingYn: item?.chgBuilding[0]?.bdstChgNm !== null && item?.chgBuilding.length > 0 ? 'Y' : 'N',
+          instlCst: item.reuseBuilding[0]?.instlCst === -1 ? "확인불가" : item.reuseBuilding[0]?.instlCst,
+          instlCstSprtAmt: item.reuseBuilding[0]?.instlCstSprtAmt === -1 ? "확인불가" : item.reuseBuilding[0]?.instlCstSprtAmt,
+        }
+      })
+      .filter(
+        (item: customRswtBdst) =>
+          item.reuseBuilding[0]?.rswtrObj !== undefined
+      );
 
-      setBdstTable(chData);
-    }
+    setBdstTable(chData);
   }, [code, rswtSttnRes]);
 
   useEffect(() => {
@@ -95,13 +136,11 @@ export default function RswtSttn() {
     }
   }, [rswtSttn.excelList]);
 
-  const excelClick = useCallback(
-    (returnType: ReturnType) => {
-      if (codeCityOrSgg)
-        rswtSttnSearch(1, "10000", codeCityOrSgg, code.cityCd, code.sggCd);
-    },
-    [rswtSttnSearch, code.cityCd, code.sggCd, codeCityOrSgg]
-  );
+  const excelClick = useCallback(() => {
+    // 최신 검색 조건 반영
+    const con = getConValue();
+    rswtSttnSearch(1, "10000", String(con), code.cityCd, code.sggCd);
+  }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   useEffect(() => {
     if (codeCityOrSgg != null) rswtSttnSearch(pageNation, "20", codeCityOrSgg, code.cityCd, code.sggCd);
@@ -113,38 +152,64 @@ export default function RswtSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"중수도시설 현황"} />
-            <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={<Button
-                className={btnClass}
-                onClick={() => {
-                  setIsChHead(true);
-                } }
-              >
-                조회항목설정
-              </Button>}
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                if (codeCityOrSgg)
-                  rswtSttnSearch(1, "20", codeCityOrSgg, code.cityCd, code.sggCd);
-              } }
-              excelClick={excelClick}
-              initClick={function (): void { } }
-              btnClass={btnClass}
-              ref={ref} isAdmin={false}            />
+            <SearchDiv>
+              <SearchFormLeft>
+                <div className="col-span-10 flex flex-row">
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl"
+                    label="시도"
+                    selectClass={""}
+                    selectArray={code.cityCd}
+                    onSelectValue={getSelCity}
+                  />
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl ml-4"
+                    label="시군구"
+                    selectClass={""}
+                    selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
+                    onSelectValue={getSgg}
+                  />
+                </div>
+              </SearchFormLeft>
+              <SearchFormRight
+                className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
+                    size={"sm"}
+                    onClick={() => {
+                      const con = getConValue();
+                      rswtSttnSearch(1, "20", String(con), code.cityCd, code.sggCd);
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={`${btnClass} green`}
+                    onClick={excelClick}
+                  >
+                    다운로드
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={btnClass}
+                    onClick={() => {
+                      setIsChHead(true);
+                    }}
+                  >
+                    조회항목설정
+                  </Button>
+                </div>
+              </SearchFormRight>
+            </SearchDiv>
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
           <div className="col-span-6">
             <ListDiv>
               <UiTable
-                headName={[]}
+                headName={undefined}
                 tableData={bdstTable || []}
                 children={
                   <HeadMakeColSpan upHeadList={rswtSttn.rswtSttNodeList} />
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
index dccc8719c..ba81066be 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
@@ -5,6 +5,8 @@ import type { z } from "zod";
 import { controlHeadView } from "../rainSttn";
 import type { customHtdflBdst } from "../../fcltReg/htdflReg";
 import { fetchType, getFetch } from "@/components/lib/api";
+import type { SelectDataType } from "@common/business_components";
+import { excelHtdflSttnParsing } from "./excel";
 
 const htdflSttHeadList = htdflSttHeadListExport;
 const htdflSttNodeList = htdflSttNodeListExport;
@@ -21,7 +23,8 @@ export type htdflSttnState = {
 };
 type htdflSttnActions = {
   initHtdfl: (con: string) => void;
-  htdflSttnSearch: (page: number, total: string, con: string) => void;
+  htdflSttnSearch: (page: number, total: string, con: string, sidoCode: SelectDataType[],
+    sggCode: SelectDataType[]) => void;
   htdflChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
@@ -67,22 +70,23 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
         console.log(error);
       }
     },
-    htdflSttnSearch: async (page: number, total: string, con: string) => {
+    htdflSttnSearch: async (page: number, total: string, con: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]
+    ) => {
       try {
         const htdflSttnRes = await getFetch(
           fetchType.WR,
           `/drain/facilityList/${page}/${total}/${con}`
         );
         if (Number(total) > 9000) {
-
-
+          const htdflExcel = excelHtdflSttnParsing(htdflSttnRes, sidoCode, sggCode);
           set((state: htdflSttnState) => {
-
             return {
               ...state,
               htdflSttn: {
                 ...state.htdflSttn,
-                excelList: htdflSttnRes,
+                excelList: htdflExcel,
               },
             };
           });

From 45a0ff043dc090b840edf734ca2f51b5a6e4d121 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Thu, 3 Jul 2025 16:32:23 +0900
Subject: [PATCH 19/44] =?UTF-8?q?=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=A4?=
 =?UTF-8?q?=EC=A0=81=ED=98=84=ED=99=A9=20=EC=9E=A5=EB=82=B4=EC=99=B8?=
 =?UTF-8?q?=EC=9A=A9=EC=88=98=20=EC=B4=9D=EC=8B=A4=EC=A0=81=20=EC=B0=A8?=
 =?UTF-8?q?=ED=8A=B8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prfmncSttn/pbnstPrfmncSttn/page.tsx       | 121 +++++++++---------
 .../prfmncSttn/pbnstPrfmncSttn/index.tsx      |  34 ++---
 2 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
index f689eb745..3e860d744 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/pbnstPrfmncSttn/page.tsx
@@ -68,8 +68,6 @@ export default function PbnstPrfmncSttn() {
         chartData5: lineChartDataProps[];
         chartData6: lineChartDataProps[];
         chartData7: lineChartDataProps[];
-        chartData8: lineChartDataProps[];
-        chartData9: lineChartDataProps[];
     }>();
     const [outLineData, setOutLineData] = useState<{
         chartData1: lineChartDataProps[];
@@ -78,6 +76,8 @@ export default function PbnstPrfmncSttn() {
         chartData4: lineChartDataProps[];
         chartData5: lineChartDataProps[];
         chartData6: lineChartDataProps[];
+        chartData7: lineChartDataProps[];
+        chartData8: lineChartDataProps[];
     }>();
 
     type dnChartForm = { label: string, val: number, fill?: string };
@@ -228,16 +228,18 @@ export default function PbnstPrfmncSttn() {
                         indstUswtr += element.indstUswtr;
 
                         // 월별 합계
-                        inUsageSum = element.wshwtr
+                        inUsageSum =
+                            element.wshwtr
                             + element.coolUswtr
                             + element.cleanUswtr
                             + element.drwtUswtr
                             + element.dltnUswtr
                             + element.ithlRswtr
                             + element.ithlEtcUswtr
-                            + element.cleanToilUswtr
-                            + element.resn;
-                        outUsageSum = element.lndwtr
+                        outUsageSum =
+                            element.cleanToilUswtr
+                            + element.resn
+                            + element.lndwtr
                             + element.hydUswtr
                             + element.ugwtChr
                             + element.farmUswtr
@@ -258,9 +260,10 @@ export default function PbnstPrfmncSttn() {
                         dltnUswtrData.push({ label: `${month}월`, val: element.dltnUswtr, color: "purple" });
                         ithlRswtrData.push({ label: `${month}월`, val: element.ithlRswtr, color: "green" });
                         ithlEtcUswtrData.push({ label: `${month}월`, val: element.ithlEtcUswtr, color: "blue" });
+
+
                         cleanToilUswtrData.push({ label: `${month}월`, val: element.cleanToilUswtr, color: "magenta" });
                         resnData.push({ label: `${month}월`, val: element.resn, color: "skyblue" });
-
                         lndwtrData.push({ label: `${month}월`, val: element.lndwtr, color: "red" });
                         hydUswtrData.push({ label: `${month}월`, val: element.hydUswtr, color: "orange" });
                         ugwtChrData.push({ label: `${month}월`, val: element.ugwtChr, color: "yellow" });
@@ -271,22 +274,18 @@ export default function PbnstPrfmncSttn() {
                 }
             });
 
+            let dnTotalIn = 0;
+            let dnTotalOut = 0;
+            inUsageArr.forEach((item) => {
+                dnTotalIn += item
+            })
+            outUsageArr.forEach((item) => {
+                dnTotalOut += item
+            })
+
             // 도넛차트 데이터
-            dnData.push({ label: "세척수", val: wshwtr, fill: "#F7CFD8" });
-            dnData.push({ label: "냉각수", val: coolUswtr, fill: "#F4F8D3" });
-            dnData.push({ label: "청소수", val: cleanUswtr, fill: "#A6D6D6" });
-            dnData.push({ label: "식수대", val: drwtUswtr, fill: "#8E7DBE" });
-            dnData.push({ label: "희석용수", val: dltnUswtr, fill: "#FF8383" });
-            dnData.push({ label: "중수도", val: ithlRswtr, fill: "#FFF574" });
-            dnData.push({ label: "기타", val: ithlEtcUswtr, fill: "#A1D6CB" });
-            dnData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "#A19AD3" });
-            dnData.push({ label: "세척살수용수", val: resn, fill: "#B1F0F7" });
-            dnData.push({ label: "조경용수", val: lndwtr, fill: "#81BFDA" });
-            dnData.push({ label: "친수용수", val: hydUswtr, fill: "#F5F0CD" });
-            dnData.push({ label: "지하수충전", val: ugwtChr, fill: "#FADA7A" });
-            dnData.push({ label: "농업용수", val: farmUswtr, fill: "#A6AEBF" });
-            dnData.push({ label: "하천등유지용수", val: rvrKeepUswtr, fill: "#C5D3E8" });
-            dnData.push({ label: "공업용수", val: indstUswtr, fill: "#D0E8C5" });
+            dnData.push({ label: "장내용수", val: dnTotalIn, fill: "#8DD8FF" });
+            dnData.push({ label: "장외용수", val: dnTotalOut, fill: "#FFF085" });
 
             // 장내용수 도넛
             dnInData.push({ label: "세척수", val: wshwtr, fill: "#F7CFD8" });
@@ -296,10 +295,10 @@ export default function PbnstPrfmncSttn() {
             dnInData.push({ label: "희석용수", val: dltnUswtr, fill: "#FF8383" });
             dnInData.push({ label: "중수도", val: ithlRswtr, fill: "#FFF574" });
             dnInData.push({ label: "기타", val: ithlEtcUswtr, fill: "#A1D6CB" });
-            dnInData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "#A19AD3" });
-            dnInData.push({ label: "세척살수용수", val: resn, fill: "#B1F0F7" });
 
             // 장외용수 도넛
+            dnOutData.push({ label: "청소화장실용수", val: cleanToilUswtr, fill: "#A19AD3" });
+            dnOutData.push({ label: "세척살수용수", val: resn, fill: "#B1F0F7" });
             dnOutData.push({ label: "조경용수", val: lndwtr, fill: "#81BFDA" });
             dnOutData.push({ label: "친수용수", val: hydUswtr, fill: "#F5F0CD" });
             dnOutData.push({ label: "지하수충전", val: ugwtChr, fill: "#FADA7A" });
@@ -315,17 +314,17 @@ export default function PbnstPrfmncSttn() {
                 chartData4: drwtUswtrData,
                 chartData5: dltnUswtrData,
                 chartData6: ithlRswtrData,
-                chartData7: ithlEtcUswtrData,
-                chartData8: cleanToilUswtrData,
-                chartData9: resnData
+                chartData7: ithlEtcUswtrData
             });
             setOutLineData({
-                chartData1: lndwtrData,
-                chartData2: hydUswtrData,
-                chartData3: ugwtChrData,
-                chartData4: farmUswtrData,
-                chartData5: rvrKeepUswtrData,
-                chartData6: indstUswtrData,
+                chartData1: cleanToilUswtrData,
+                chartData2: resnData,
+                chartData3: lndwtrData,
+                chartData4: hydUswtrData,
+                chartData5: ugwtChrData,
+                chartData6: farmUswtrData,
+                chartData7: rvrKeepUswtrData,
+                chartData8: indstUswtrData,
             });
             setBarData(barData);
             setChartData(dnData);
@@ -408,15 +407,7 @@ export default function PbnstPrfmncSttn() {
                 chartData7: {
                     label: '기타',
                     color: "blue",
-                },
-                chartData8: {
-                    label: '청소화장실용수',
-                    color: "magenta",
-                },
-                chartData9: {
-                    label: '세척살수용수',
-                    color: "skyblue",
-                },
+                }
             } satisfies ChartConfig;
             setLnInChartConfig(newChartConfig);
         }
@@ -427,26 +418,34 @@ export default function PbnstPrfmncSttn() {
         if (outLineData?.chartData1) {
             const newChartConfig = {
                 chartData1: {
-                    label: '조경용수',
+                    label: '청소화장실용수',
                     color: "red",
                 },
                 chartData2: {
+                    label: '세척살수용수',
+                    color: "pink",
+                },
+                chartData3: {
+                    label: '조경용수',
+                    color: "gray",
+                },
+                chartData4: {
                     label: '친수용수',
                     color: "orange",
                 },
-                chartData3: {
+                chartData5: {
                     label: '지하수충전',
                     color: "yellow",
                 },
-                chartData4: {
+                chartData6: {
                     label: '농업용수',
                     color: "green",
                 },
-                chartData5: {
+                chartData7: {
                     label: '하천등유지용수',
                     color: "blue",
                 },
-                chartData6: {
+                chartData8: {
                     label: '공업용수',
                     color: "purple",
                 },
@@ -615,7 +614,7 @@ export default function PbnstPrfmncSttn() {
                             <h1 className="">장내·외 월별 하수재이용실적 현황</h1>
                             <div className="flex">
                                 <div className="w-1/3">
-                                    <MainChart chartConfig={barChartConfig} chartData={barData} chartTitle={"월별 장내·외 용수 총 실적"} chartForm={CHART_FORM.DOUBLEBAR} />
+                                    <MainChart chartConfig={barChartConfig} chartData={barData} chartTitle={"월별 장내·외 용수 총 실적"} chartForm={CHART_FORM.DOUBLEBAR} showLegend={true} />
                                 </div>
                                 <div className="w-1/3">
                                     <MainChart chartConfig={lnInChartConfig} chartData={inLineData} chartTitle={"월별 장내 용수 실적"} chartForm={CHART_FORM.LINE} />
@@ -627,25 +626,25 @@ export default function PbnstPrfmncSttn() {
                             <h1 className="">하수재이용실적 현황</h1>
                             <ListDiv className="col-span-8 pr-6  ">
                                 {/* <ScrollArea className="h-[60vh]"> */}
-                                    {/* <div className="card-header">
+                                {/* <div className="card-header">
                                         <h3 className="text-2xl font-medium text-label">
                                             {"하수처리수재이용 실적(m3) 등록결과"}
                                         </h3>
                                     </div> */}
 
-                                    <UiTable
-                                        headName={undefined}
-                                        tableData={prfData || []}
-                                        headlist={monthHeadList}
-                                        pageSize={0}
-                                        total={0}
-                                        cellClick={undefined}
-                                        onPageChange={function (page: number): void {
-                                            throw new Error("Function not implemented.");
-                                        }}>
-                                    </UiTable>
+                                <UiTable
+                                    headName={undefined}
+                                    tableData={prfData || []}
+                                    headlist={monthHeadList}
+                                    pageSize={0}
+                                    total={0}
+                                    cellClick={undefined}
+                                    onPageChange={function (page: number): void {
+                                        throw new Error("Function not implemented.");
+                                    }}>
+                                </UiTable>
 
-                                    {/* <ListDiv className="col-span-8 pr-6  ">
+                                {/* <ListDiv className="col-span-8 pr-6  ">
                                         <ScrollArea className="h-[60vh]">
                                             <div className="card-header">
                                                 <h3 className="text-2xl font-medium text-label">
diff --git a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx
index b513085ae..db8b6a717 100644
--- a/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/pbnstPrfmncSttn/index.tsx
@@ -148,7 +148,7 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions
             let usageSum = 0;
             let year = "";
             const yearsData = []
-
+            
             res.data.forEach((item) => {
                 if (item.prfList.length === 0) {
                     const year = ""; // 연도 정보가 없으면 빈 문자열, 필요시 item에서 추출
@@ -161,26 +161,26 @@ export const pbnstPrfmncSttnActionsExport: (set: any) => pbnstPrfmncSttnActions
                 item.prfList.forEach((acc) => {
                     year = acc.ym?.substring(0, 4) ?? "";
                     inUsageSum =
-                        (acc.wshwtr ?? 0) +
-                        (acc.coolUswtr ?? 0) +
-                        (acc.cleanUswtr ?? 0) +
-                        (acc.drwtUswtr ?? 0) +
-                        (acc.dltnUswtr ?? 0) +
-                        (acc.ithlRswtr ?? 0) +
-                        (acc.ithlEtcUswtr ?? 0) +
-                        (acc.cleanToilUswtr ?? 0) +
-                        (acc.resn ?? 0);
+                        (acc.wshwtr ?? 0) +             //조경용수
+                        (acc.coolUswtr ?? 0) +          //냉각수
+                        (acc.cleanUswtr ?? 0) +         //청소수
+                        (acc.drwtUswtr ?? 0) +          //식수대
+                        (acc.dltnUswtr ?? 0) +          //희석용수
+                        (acc.ithlRswtr ?? 0) +          //중수도
+                        (acc.ithlEtcUswtr ?? 0)         //기타
                     outUsageSum =
-                        (acc.lndwtr ?? 0) +
-                        (acc.hydUswtr ?? 0) +
-                        (acc.ugwtChr ?? 0) +
-                        (acc.farmUswtr ?? 0) +
-                        (acc.rvrKeepUswtr ?? 0) +
-                        (acc.indstUswtr ?? 0);
+                        (acc.cleanToilUswtr ?? 0) +     //청소화장실용수
+                        (acc.resn ?? 0)+                //세척살수용도
+                        (acc.lndwtr ?? 0) +             //조경용수
+                        (acc.hydUswtr ?? 0) +           //친수용수
+                        (acc.ugwtChr ?? 0) +            //지하수충전
+                        (acc.farmUswtr ?? 0) +          //농업용수
+                        (acc.rvrKeepUswtr ?? 0) +       //하천등유지용수
+                        (acc.indstUswtr ?? 0);          //공업용수
                     const yearData = yearsData.find(
                         (yearItem) =>
                             yearItem.year === year &&
-                            yearItem.pbnstRuseFcltPk == acc.pbnstRuseFcltPk
+                            yearItem.pbnstRuseFcltPk == acc.pbnstRuseFcltFk
                     );
 
                     if (yearData) {

From b20948fcfe67039f4e02fa04e3945ad08dd93431 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Thu, 3 Jul 2025 19:46:11 +0900
Subject: [PATCH 20/44] =?UTF-8?q?=EC=9E=A0=EC=9E=AC=EC=88=98=EC=9A=94?=
 =?UTF-8?q?=EC=B2=98=20=EC=97=91=EC=85=80=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C?=
 =?UTF-8?q?=20=EB=A1=9C=EB=94=A9=EB=B0=94=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx |  7 +-
 .../app/store/matDmd/ldrmntCoSttn/index.tsx   | 64 +++++++++++++------
 .../coReg/coRegExcel/coRegExcelModal.tsx      | 39 +++++------
 3 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
index eb43b29bf..e33bcc265 100644
--- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx
@@ -28,8 +28,10 @@ import {
   type SelectDataType
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
 import { Button } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { Toaster } from "react-hot-toast";
 
 export default function LdrmntCoSttn() {
   const { code, ldrmnt, ldrmntInit, ldrmntSearch, } = useWrStore(
@@ -273,7 +275,7 @@ export default function LdrmntCoSttn() {
             <div className="overflow-x-auto">
               <ListDiv className="min-w-max">
                 <UiTable
-                  headName={[]}
+                  headName={undefined}
                   tableData={bdstTable || []}
                   headlist={ldrmntHeadListExport}
                   pageSize={20}
@@ -299,8 +301,9 @@ export default function LdrmntCoSttn() {
               setIsExcelOpen({ isModal: !isExcelOpen.isModal })
             }}
             bodyClass={"w-[40vw] max-w-none"}
-            body={<CoRegExcel />}
+            body={<CoRegExcel isModal={(isOpen) => setIsExcelOpen({ isModal: isOpen })} />}
           />
+          <Toaster position="top-center"></Toaster>
 
         </div>
 
diff --git a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
index 6a5f18247..289ced6e1 100644
--- a/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/ldrmntCoSttn/index.tsx
@@ -20,6 +20,7 @@ export type ldrmntState = {
     excelList: ExcelType[];
     isInit: boolean;
     ldrmntRes: customLdrmnt[];
+    isLoading: boolean;
   };
 };
 
@@ -35,6 +36,7 @@ type ldrmntActions = {
   ldrmntSearch: (page: number, sggCd: string, total: string, coNm: string) => void;
   ldrmntUpdate: (ldrmntRes: customLdrmnt) => void;
   ldrmntDelete: () => void;
+  loadingOpen: (isOpen: boolean) => void
 };
 
 export type ldrmntType = ldrmntState & ldrmntActions;
@@ -46,6 +48,7 @@ export const ldrmntStateExport: ldrmntState = {
     excelList: [],
     isInit: false,
     ldrmntRes: ldrmntRes,
+    isLoading: false,
   },
 };
 
@@ -75,31 +78,30 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
         console.log(e)
       }
     },
+    loadingOpen: (isOpen) => {
+      return set((state: ldrmntState) => {
+        return {
+          ...state,
+          ldrmnt: {
+            ...state.ldrmnt,
+            isLoading: isOpen,
+          },
+        };
+      });
+    },
     ldrmntRegData: async (data) => {
-      try {
-        const response = await postFectch(
-          "/reuseFc/request/temp",
-          data,
-          fetchType.WR
-        );
+      await deleteFectch(
+        `/reuseFc/request/temp`,
+      );
 
-        console.log('response ', response)
+      const response = await postFectch(
+        "/reuseFc/request/temp",
+        data,
+        fetchType.WR
+      );
 
-        if (response.status === 200) {
-          ToastFormUi({
-            body: "잠재수요처 등록이 완료되었습니다. ",
-            title: "잠재수요처 등록",
-          });
+      console.log('response ', response)
 
-        }
-      } catch (e) {
-        console.log(e)
-        ToastFormUi({
-          body: "잠재수요처 등록이 실패하였습니다. ",
-          title: "잠재수요처 등록",
-        });
-
-      }
     },
     ldrmntSearch: async (page: number, total: string, sggCd: string, coNm: string) => {
       let searchUrl = "";
@@ -111,6 +113,7 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
           searchUrl = `/reuseFc/request/temp/${page}/${total}/${sggCd}`;
         }
       }
+
       try {
         const ldrmntRes = await getFetch(
           fetchType.WR,
@@ -178,11 +181,30 @@ export const ldrmntActionsExport: (set: any) => ldrmntActions = (
     },
     ldrmntDelete: async () => {
       try {
+        set((state: ldrmntState) => {
+          return {
+            ...state,
+            ldrmnt: {
+              ...state.ldrmnt,
+              isLoading: true,
+            },
+          };
+        });
         const response = await deleteFectch(
           `/reuseFc/request/temp`,
         );
 
       } catch (error) {
+        console.log("error", error)
+        set((state: ldrmntState) => {
+          return {
+            ...state,
+            ldrmnt: {
+              ...state.ldrmnt,
+              isLoading: false,
+            },
+          };
+        });
         console.error("Error ldrmntDelete:", error);
       }
     },
diff --git a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
index 89f15a3cc..6f6afe186 100644
--- a/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
+++ b/apps/wr/components/ui/modal/coReg/coRegExcel/coRegExcelModal.tsx
@@ -4,32 +4,36 @@ import type { customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn";
 import { names } from "@/app/store/matDmd/ldrmntCoSttn/excel";
 import { filePicked, FileUpload, FormUi, Title } from "@common/business_components/ui";
 import { Form, FormField } from "@common/business_components/ui/form";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
 import { Button, Progress } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import toast from "react-hot-toast";
 import type { z } from "zod";
 
-export default function CoRegExcel() {
-
-
+export default function CoRegExcel({ isModal }: { isModal: (open: boolean) => void }) {
+  const { ldrmnt,loadingOpen } = useWrStore((state) => state);
+  const { isLoading } = ldrmnt;
   const form = useForm<z.infer<typeof coRegExcel>>({
     resolver: zodResolver(coRegExcel),
   });
   const { ldrmntRegData, ldrmntDelete } = useWrStore((state) => state);
   const [excelData, setExcelData] = useState<customLdrmnt[]>();
 
-
   const [file, setFiles] = useState<File | undefined>();
 
+  useEffect(() => {
+    console.log("ldrmnt", ldrmnt)
+  }, [ldrmnt])
+
   const onSubmit = (values: z.infer<typeof coRegExcel>) => {
-    ldrmntDelete();
+    loadingOpen(true);
     if (file) {
-      filePicked(file, 0).then((res) => {
-        //TODO:loading
+      filePicked(file, 0).then(async (res) => {
+
         try {
           let array: { [key: string]: string | number }[] = []
-          let isError = false;
           if (Array.isArray(res)) {
             res.some((item, index) => {
               let object: { [key: string]: string | number } = {}
@@ -43,26 +47,24 @@ export default function CoRegExcel() {
                 }
                 return false;
               })
-              if (isError === true)
-                return true;
+
               array.push(object)
 
-              if (index != 0 && index % 5000 == 0) {
-                ldrmntRegData(array);
-                array = []
-                array.length = 0;
-              }
               return false;
             })
           }
-          if (isError === false)
-            ldrmntRegData(array);
+          await ldrmntRegData(array);
+          isModal(false);
+          loadingOpen(false);
+          toast.success(`잠재수요처 등록이 완료되었습니다.`);
         } catch (e) {
           console.log(e)
+          loadingOpen(false);
           alert(e)
           return true;
         }
-
+      }).catch((e)=>{
+        console.log("file", e);
       });
     };
   }
@@ -70,6 +72,7 @@ export default function CoRegExcel() {
   return (
     <>
       <div>
+        <LoadingOverlay isLoading={isLoading}></LoadingOverlay>
         <Form {...form}>
           <form onSubmit={form.handleSubmit(onSubmit)}>
             <div>

From 2cc8d5209ceda52f21c5037cef86a593ccdb9c66 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Thu, 3 Jul 2025 20:22:19 +0900
Subject: [PATCH 21/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/coMatRvw/page.tsx    |  18 +-
 apps/wr/app/matMng/coMng/coSttn/page.tsx      |   9 +-
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  | 190 +++++++++++++-----
 .../wr/app/store/matDmd/coMatRvw/headList.tsx |   4 +-
 apps/wr/app/store/matDmd/coMatRvw/index.tsx   |   6 +
 apps/wr/app/store/matDmd/coMatRvw/type.tsx    |   2 +-
 apps/wr/app/store/matDmd/coSttn/headList.tsx  |   5 +
 apps/wr/app/store/matDmd/coSttn/index.tsx     |   2 +-
 .../prfmncReg/chkgdnReg/rainChkgdn/excel.tsx  |   6 +-
 .../chkgdnReg/rainChkgdn/headList.tsx         |  16 +-
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  | 164 +++++++++++----
 .../chkgdnReg/rswrtChkgdn/headList.tsx        |  20 +-
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx | 182 ++++++++++++-----
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       |   4 +-
 .../chkgdnSttn/rswtChkgdnSttn/headList.tsx    |   2 +-
 .../fcltSttn/rainSttn/headList.tsx            |   4 +-
 apps/wr/components/lib/api/index.ts           |  23 +++
 apps/wr/components/lib/func/TableData.tsx     |  43 ++--
 apps/wr/components/lib/func/commom.tsx        |  42 ++--
 .../ui/form/coMat/conCostForm/conCostForm.tsx |   6 +-
 .../ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx  |  21 +-
 .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx  |  18 +-
 .../guideDetailTable/guideDetailTable.tsx     |   5 +-
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   |  25 ++-
 .../chkgdTable/rswtChkgd/rswtChkgdTable.tsx   |  14 +-
 25 files changed, 606 insertions(+), 225 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
index c1e601320..5d4592ad5 100644
--- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
@@ -1,5 +1,4 @@
 "use client";
-
 import { useWrStore } from "@/app/store";
 import {
   DmdCoReqSchema,
@@ -9,6 +8,7 @@ import {
 } from "@/app/store/matDmd/coMatRvw/type";
 import { formH1Class, formTableName } from "@/components/lib/class/comClass";
 import {
+  formatPhoneNumber,
   getCity,
   getdmdMatFlag,
   tableData,
@@ -112,18 +112,20 @@ export default function CoMatRvw() {
   }, [form.watch("useUsgCd")]);
 
   useEffect(() => {
-    if (coMatRvwRes.length > 0) {
+    if (coMatRvwRes&&coMatRvwRes.length > 0) {
       const data = coMatRvwRes?.map((item, index) => {
         let flag = "";
-          flag = getdmdMatFlag(item?.demandMatching?.splyFcltFlg ??"");
+
+          flag = getdmdMatFlag(item?.demandMatching?.splyFcltFlg||undefined);
+
         return {
           ...item,
           ctpvCd: item.demandCo?.ctpvCd,
           sggCd: item.demandCo?.sggCd,
           dmdCoNm: item.demandCo?.dmdCoNm,
           daddr: item.demandCo?.daddr,
-          telno: item.demandCo?.telno,
-          regDt: moment(item?.demandCo?.regDt).format("YYYY-MM-DD"),
+          telno: formatPhoneNumber(item.demandCo?.telno||'') ,
+         
           splyFcltFlg: flag,
         };
       });
@@ -181,7 +183,7 @@ export default function CoMatRvw() {
                   <div className="col-span-7 w-full">
                     <div className="flex flex-row items-center">
                       <Label className="text-xl text-gray-600 mx-6">
-                        하수 재이용년도
+                        수요신청년도
                       </Label>
                       <SelectBox
                         className="h-full w-32 text-2xl"
@@ -269,7 +271,7 @@ export default function CoMatRvw() {
               ></UiTable>
             </ListDiv>
             <hr />
-            <ScrollArea className="h-[49vh]">
+            {/* <ScrollArea className="h-[49vh]"> */}
               <ListDiv>
                 <h3 className="mt-4 ml-2 text-2xl font-medium text-label">
                   수요신청 상세현황
@@ -662,7 +664,7 @@ export default function CoMatRvw() {
                 </Form>
                 <ConCostForm form={form} type={"mat"} />
               </ListDiv>
-            </ScrollArea>
+            {/* </ScrollArea> */}
           </div>
         </div>
       </ContentsDiv>
diff --git a/apps/wr/app/matMng/coMng/coSttn/page.tsx b/apps/wr/app/matMng/coMng/coSttn/page.tsx
index 181a5d82f..9b682a2aa 100644
--- a/apps/wr/app/matMng/coMng/coSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/coSttn/page.tsx
@@ -26,6 +26,7 @@ import ListDiv from "@common/business_components/ui/list_div";
 import SdmInsertForm from "@common/business_components/ui/sdmInsertForm";
 import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
 import { Button } from "@common/components/ui";
+import moment from "moment";
 import { useCallback, useEffect, useState } from "react";
 import toast, { Toaster } from "react-hot-toast";
 
@@ -83,6 +84,10 @@ export default function CoSttn() {
         const data = tableData(coSttnRes, { code });
         const chData = data.map((item: any) => ({
           ...item,
+          regDt: moment(item.regDt).format("YYYY-MM-DD")
+
+
+
         }));
         // .filter((item: any) => item !== undefined);
         setBdstTable(chData);
@@ -182,7 +187,7 @@ export default function CoSttn() {
                     onClick={() => {
                       /* 저장 로직 */
                       if (!upadateData) {
-                        <ToastFormUi body={"수요처 변경을 원하는 행을 선택해주세요"} title={"수요처관리"}></ToastFormUi>;
+                      toast.error("수요처 변경을 원하는 행을 선택해주세요")
                       }else{
                         setIsDmdModal({
                           ...isDmdModal,
@@ -190,7 +195,7 @@ export default function CoSttn() {
                       }
                     }}
                   >
-                    저장
+                    수정
                   </Button>
                   <Button
                     size={"sm"}
diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index 88a0de300..033d3a23d 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -1,10 +1,14 @@
 "use client";
 
 import { useWrStore } from "@/app/store";
-import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import type {
-  rswtChkZodType,
-  rswtrChkDetailsZodType,
+import {
+  commonCd,
+  rainPageSize,
+  type rainChkZodType,
+} from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import {
+  rswtPageSize,
+  type rswtrChkDetailsZodType,
 } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import {
   excelArrayDownload,
@@ -15,6 +19,7 @@ import ChkgdExcel from "@/components/ui/modal/chkgd/chkgdExcel/chkgdExcel";
 import ChkgdModal from "@/components/ui/modal/chkgd/chkgdModal/chkgdModal";
 import RainChkgdTable from "@/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable";
 import RswtChkgdTable from "@/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable";
+import { SearchInput } from "@common/business_components";
 import {
   ContentsDiv,
   SearchDiv,
@@ -25,9 +30,16 @@ import {
   UiModal,
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
 import { Button, Label } from "@common/components/ui";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@common/components/ui/tooltip";
 import { useCallback, useEffect, useState } from "react";
-import { Toaster } from "react-hot-toast";
+import toast, { Toaster } from "react-hot-toast";
 
 export default function Page() {
   const {
@@ -39,8 +51,10 @@ export default function Page() {
     rainChkDelete,
     rainChkExcelDownload,
     rainChkHeadChange,
+    rainChkNmSearch,
     isRainSttn,
     rswtChkgdnInit,
+    rswtChkNmSearch,
     rswtChkPolInit,
     rswtChkDetilsUpdate,
     rswtChkDelete,
@@ -57,39 +71,84 @@ export default function Page() {
     rswtrChkDetailsZodType[]
   >([]);
   const [deleteIdx, setDeleteIdx] = useState<number[]>([]);
-  const [pageNation, setPageNation] = useState(1);
+  const [rainPageNation, setRainPageNation] = useState(1);
+  const [rswtPageNation, setRswtPageNation] = useState(1);
+  const [fcltNm, setFcltNm] = useState<string>("");
   const [selFcltDiv, setSelFcltDiv] = useState("RNB");
   const [isModal, setIsModal] = useState({
     open: false,
     data: {},
   });
-  const cellClick = () => {
-    if (searchYear)
-      if (selFcltDiv === "RNB") {
-        rainChkInit("1", "20", searchYear, "0");
-      } else {
-        rswtChkgdnInit("1", "20", searchYear, "0");
-      }
-  };
-
   const [searchYear, setSearchYear] = useState<string>(
     String(new Date().getFullYear())
   );
+  const cellClick = () => {
+    if (searchYear)
+      if (selFcltDiv === "RNB") {
+        if (fcltNm) {
+          rainChkNmSearch(
+            rainPageNation,
+            rainPageSize,
+            searchYear,
+            commonCd,
+            fcltNm
+          );
+        } else {
+          rainChkInit(rainPageNation, rainPageSize, searchYear, commonCd);
+        }
+      } else {
+        if (fcltNm) {
+          rswtChkNmSearch(
+            rainPageNation,
+            rainPageSize,
+            searchYear,
+            commonCd,
+            fcltNm
+          );
+        } else {
+          rswtChkgdnInit(rswtPageNation, rswtPageSize, searchYear, commonCd);
+        }
+      }
+  };
+  const rainPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRainPageNation(pageNo);
+      rainChkInit(pageNo, rainPageSize, searchYear, commonCd);
+    }
+  };
+  const rswtPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRswtPageNation(pageNo);
+      rswtChkgdnInit(pageNo, rswtPageSize, searchYear, commonCd);
+    }
+  };
 
   useEffect(() => {
     if (!rainChkgdn.isInit) {
-      rainChkInit("1", "20", new Date().getFullYear().toString(), "0");
+      rainChkInit(
+        1,
+        rainPageSize,
+        new Date().getFullYear().toString(),
+        commonCd
+      );
       isRainSttn(false);
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
+  }, [rainChkgdn.isInit, rainChkInit, rainPageSize]);
 
+  useEffect(() => {
     if (!rswtChkgdn.isInit) {
-      rswtChkgdnInit("1", "20", new Date().getFullYear().toString(), "0");
+      rswtChkgdnInit(
+        1,
+        rswtPageSize,
+        new Date().getFullYear().toString(),
+        commonCd
+      );
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
-  }, [rainChkgdn.isInit, rainChkInit]);
+  }, [rswtChkgdn.isInit, rswtChkgdnInit, rswtPageSize]);
 
   useEffect(() => {
     if (rswtChkgdn.excelList[0] && rswtChkgdn.excelList[0]?.data.length > 1) {
@@ -133,8 +192,8 @@ export default function Page() {
   );
 
   useEffect(() => {
-    //rainChkgdn.isSttn = false;
-    //rswtChkgdn.isSttn = false;
+    rainChkgdn.isSttn = false;
+    rswtChkgdn.isSttn = false;
     if (!rainChkgdn.isSttn && !rswtChkgdn.isSttn) {
       rainChkHeadChange({ rainChkgdn }, true);
       rswtChkHeadChange({ rswtChkgdn }, true);
@@ -152,9 +211,17 @@ export default function Page() {
   };
   const chkUpdateTable = (selFcltDiv: string) => {
     if (selFcltDiv === "RNB") {
-      rainChkDetilUpdate(updateRainDetail);
+      if (updateRainDetail && updateRainDetail.length > 0) {
+        rainChkDetilUpdate(updateRainDetail);
+      } else {
+        toast.error("수정을 원하는 행을 선택하고 저장버튼을 눌러주세요 ");
+      }
     } else {
-      rswtChkDetilsUpdate(updateRswtDetail);
+      if (updateRswtDetail && updateRswtDetail.length > 0) {
+        rswtChkDetilsUpdate(updateRswtDetail);
+      } else {
+        toast.error("수정을 원하는 행을 선택하고 저장버튼을 눌러주세요 ");
+      }
     }
   };
 
@@ -176,10 +243,8 @@ export default function Page() {
                   selectArray={yearOptions}
                   value={searchYear}
                   onSelectValue={(val: string | number) => {
-                    setSearchYear(String(val))
-                  }
-
-                  }
+                    setSearchYear(String(val));
+                  }}
                 />
               </div>
               <div className="col-span-2 flex flex-row space-x-2">
@@ -193,12 +258,22 @@ export default function Page() {
                   selectArray={rainChkgdn.fcltDiv}
                   onSelectValue={(val: string | number) => {
                     if (val === "RST") rswtChkPolInit();
-                    setSelFcltDiv(String(val))
-                  }
-                  }
+                    setSelFcltDiv(String(val));
+                  }}
                   value={selFcltDiv ?? rainChkgdn.fcltDiv[0]?.val}
                 />
               </div>
+              <div className="col-span-2 flex flex-row space-x-2">
+                <Label className="w-28 mt-2 text-xl text-gray-600">
+                  {"시설명"}
+                </Label>
+                <SearchInput
+                  className={"w-full h-full text-2xl"}
+                  label={""}
+                  textValue={fcltNm || ""}
+                  setText={setFcltNm}
+                />
+              </div>
             </SearchFormLeft>
             <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
               <div className="space-y">
@@ -219,14 +294,28 @@ export default function Page() {
                   >
                     삭제
                   </Button>
-                  <Button
-                    size={"sm"}
-                    onClick={() => {
-                      chkUpdateTable(selFcltDiv);
-                    }}
-                  >
-                    저장
-                  </Button>
+
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <Button
+                          size={"sm"}
+                          onClick={() => {
+                            chkUpdateTable(selFcltDiv);
+                          }}
+                        >
+                          저장
+                        </Button>
+                      </TooltipTrigger>
+                      <TooltipContent side="bottom" sideOffset={5}>
+                        <h2 className="text-xl">
+                          아래 테이블에 선택을 체크하면 입력셀이 활성화 됩니다.
+                        </h2>
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
+
+               
                   <Button
                     size={"sm"}
                     onClick={() => {
@@ -253,8 +342,8 @@ export default function Page() {
                 detailUp={setUpdateRainDetail}
                 handleClick={handleClick}
                 rainChkData={rainChkgdn.rainChk}
-                pageNation={pageNation}
-                onPageChange={setPageNation}
+                pageNation={rainPageNation}
+                onPageChange={rainPageChange}
               />
             ) : (
               <RswtChkgdTable
@@ -262,8 +351,8 @@ export default function Page() {
                 deleteRswtData={setDeleteIdx}
                 handleRswtClick={handleClick}
                 rswtChkData={rswtChkgdn.rswtChkRes}
-                pageNation={pageNation}
-                onPageChange={setPageNation}
+                pageNation={rswtPageNation}
+                onPageChange={rswtPageChange}
               />
             )}
           </ListDiv>
@@ -271,17 +360,28 @@ export default function Page() {
       </div>
       <UiModal
         open={isModal.open}
-        onOpenChange={() => {
-          setIsModal({ open: !open, data: {} });
+        onOpenChange={(open: boolean) => {
+          setIsModal((prev) => ({ ...prev, open }));
         }}
         bodyClass={"w-[80vw] max-w-none"}
-        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} />}
+        body={
+          <ChkgdModal
+            type={selFcltDiv}
+            obj={isModal.data}
+            setIsModal={(open) => setIsModal((prev) => ({ ...prev, open }))}
+          />
+        }
       ></UiModal>
       <UiModal
         open={isRegExcel}
         onOpenChange={setIsRegExcel}
         bodyClass={"w-[30vw] max-w-none"}
-        body={<ChkgdExcel type={selFcltDiv}></ChkgdExcel>}
+        body={
+          <ChkgdExcel
+            type={selFcltDiv}
+            setIsRegExcel={setIsRegExcel}
+          ></ChkgdExcel>
+        }
       />
       <Toaster position="top-center" />
     </ContentsDiv>
diff --git a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
index 7b43e4b00..6b783ea68 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
@@ -29,12 +29,12 @@ export const coRvwHeadListExport: CommonTableProps[]= [
     visible: true,
   },
   {
-    id: "regDt", //바꾸기
+    id: "dmndTmng", //바꾸기
     title: "신청일자",
     visible: true,
   },
   {
-    id: "state", //바꾸기
+    id: "splyFcltFlg", //바꾸기
     title: "진행상태",
     visible: true,
   },
diff --git a/apps/wr/app/store/matDmd/coMatRvw/index.tsx b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
index 89836957b..21d4e0252 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/index.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
@@ -103,12 +103,18 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
           data
         );
 
+        if(isUpdate){
+          toast.error("수요 매칭 검토 검토로 저장되었습니다.");
+        }
+
         const coMatRvwRes = coMatInit(
           1,
           10,
           new Date().getFullYear().toString(),
           new Date().getFullYear().toString(),
         );
+
+
         return set((state: coRvwState) => ({
           ...state,
           coRvw: {
diff --git a/apps/wr/app/store/matDmd/coMatRvw/type.tsx b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
index 9f146c0fb..fb80ec415 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/type.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
@@ -53,7 +53,7 @@ import { z } from "zod";
     rgtr: z.string().nullish(),
     mdfcnDt: z.coerce.date().nullish(),
     mdfr: z.string().nullish(),
-    dmdAplyPswd: z.string(),
+    dmdAplyPswd: z.string().nullish(),
     demandInfo: z.array(DemandInfoSchema.nullish()).nullish(), // 안쓰는 거임
     demandMatchings: z.array(DemandMatchingSchema.nullish()).nullish()// 안쓰는 거임
   });
diff --git a/apps/wr/app/store/matDmd/coSttn/headList.tsx b/apps/wr/app/store/matDmd/coSttn/headList.tsx
index 80fed0d76..62c3002ac 100644
--- a/apps/wr/app/store/matDmd/coSttn/headList.tsx
+++ b/apps/wr/app/store/matDmd/coSttn/headList.tsx
@@ -44,6 +44,11 @@ export const coSttHeadListExport: z.infer<typeof sttnHeadListType> = [
     title: "전화번호",
     visible: true,
   },
+  {
+    id: "regDt",
+    title: "등록일자",
+    visible: true,
+  },
 ];
 
 export const coSttNodeListExport: CommonTableProps[] = [
diff --git a/apps/wr/app/store/matDmd/coSttn/index.tsx b/apps/wr/app/store/matDmd/coSttn/index.tsx
index 0de37bbfc..5e8baf859 100644
--- a/apps/wr/app/store/matDmd/coSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/coSttn/index.tsx
@@ -2,7 +2,7 @@ import type { CommonTableProps } from "@/app/store/common/type/header";
 import { fetchType, getFetch, getFetchWithCount } from "@/components/lib/api";
 import { coSttHeadListExport, coSttNodeListExport } from "./headList";
 import { excelCoSttnParsing } from "./excel";
-import type { DemandCompType } from "@common/business_components/ui";
+import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
 
 // 테이블 헤드 리스트
 const coSttNodeList = coSttNodeListExport;
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
index 58e8d6bf0..77045f165 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx
@@ -124,9 +124,9 @@ export const excelToRainChkData = (excelData: any, year: string) => {
             trbt: Number(item["탁도"] || 0),
             grssClfg: Number(item["총대장균군수"] || 0),
             etc: item["기타"] || "", // 필드 누락 방지
-            vltnDt: vltnDt || "-",
-            vltnMttr: item["위반사항"] || "-",
-            levyAmt: Number(item["과태료부과금액(천원)"] || 0),
+            vltnDt: vltnDt || null,
+            vltnMttr: item["위반사항"] || "",
+            levyAmt: Number(item["과태료부과금액(천원)"] || null),
             rgtr: TEST_UUID,
           },
         ],
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
index d7335e129..3cf1b5b11 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
@@ -114,10 +114,22 @@ export type splRuseWaterType = {
   ruse12: number;
 };
 
-export const rainHeadNmExport: chHeadType[] = [
+export const rainMainHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+];
+
+export const rainRuseHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "ruseWater", text: "연간대체수 이용량(m³)", length: 13 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+];
+
+
+export const rainSplHeadNmExport: chHeadType[] = [
   { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
   { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
-  { headNm: "ruseWater", text: "연간보급수 이용량(m³)", length: 13 },
   { headNm: "detailQulity", text: "분기", length: 11 },
   { headNm: "splWater", text: "연간빗물 이용량(m³)", length: 13 },
 ];
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 4c7f2d514..63d2d1d03 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -3,18 +3,20 @@ import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   deleteFectch,
   fetchType,
+  getCountFetch,
   getFetch,
   postFectch,
   putFectch,
 } from "@/components/lib/api";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import type { SelectDataType } from "@common/business_components/ui";
 import { z } from "zod";
 import { buildingToExcelType } from "./excel";
 import {
   rainChkgdnHeadListExport,
   rainChkZod,
-  rainHeadNmExport,
+  rainMainHeadNmExport,
+  rainRuseHeadNmExport,
+  rainSplHeadNmExport,
   ruseHeadListExport,
   splHeadListExport,
   type chHeadType,
@@ -22,38 +24,47 @@ import {
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import toast from "react-hot-toast";
 
+export const rainPageSize = 10;
+export const commonCd = "41";
+
 export type rainChkZodType = z.infer<typeof rainChkZod>;
 const fcltDiv = [
   { val: "RST", text: "중수도시설" },
   { val: "RNB", text: "빗물이용시설" },
 ];
 
-const rainHeadNm = rainHeadNmExport;
+const rainRuseHeadNm = rainRuseHeadNmExport;
+const rainSplHeadNm = rainSplHeadNmExport;
 const rainChkgdnHeadList = rainChkgdnHeadListExport;
 const ruseHeadList = ruseHeadListExport;
 const splHeadList = splHeadListExport;
+const rainMainHeadNm = rainMainHeadNmExport
 
 const rainChk: rainChkZodType[] = [];
 
 export type rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: TableUpperProps[];
+    rainSplHeadNm:chHeadType[]
+    rainRuseHeadNm:chHeadType[]
     rainChk: rainChkZodType[];
-    rainHeadNm: chHeadType[];
     ruseHeadList: TableUpperProps[];
     splHeadList: TableUpperProps[];
     isInit: boolean;
     isModalClose: boolean;
     fcltDiv: SelectDataType[];
+    rainMainHeadNm:chHeadType[]
     excelList: [];
     isSttn: boolean;
+    rainChkCount: number;
+    isLoading: boolean;
   };
 };
 
 type rainChkgdnActions = {
   rainChkInit: (
-    pageNo: string,
-    cnt: string,
+    pageNo: number,
+    cnt: number,
     sggCd: string,
     searchTxt: string
   ) => void;
@@ -66,6 +77,13 @@ type rainChkgdnActions = {
   rainChkExcelDataUPload(excelData: rainChkZodType[]): Promise<void>;
   rainChkDelete(chkgdnPks: number[]): Promise<void>;
   rainChkHeadChange: (rainChkgdn: rainChkgdnState, isEdit: boolean) => void;
+  rainChkNmSearch: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string,
+    txt: string
+  ) => void;
 };
 
 export type rainChkgdnType = rainChkgdnState & rainChkgdnActions;
@@ -73,7 +91,9 @@ export type rainChkgdnType = rainChkgdnState & rainChkgdnActions;
 export const rainChkgdnStateExport: rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: rainChkgdnHeadList,
-    rainHeadNm: rainHeadNm,
+    rainRuseHeadNm: rainRuseHeadNm,
+    rainSplHeadNm:rainSplHeadNm,
+    rainMainHeadNm:rainMainHeadNm,
     rainChk: rainChk,
     splHeadList: splHeadList,
     ruseHeadList: ruseHeadList,
@@ -82,6 +102,8 @@ export const rainChkgdnStateExport: rainChkgdnState = {
     excelList: [],
     fcltDiv: fcltDiv,
     isSttn: false,
+    rainChkCount: 1,
+    isLoading: false,
   },
 };
 
@@ -103,20 +125,24 @@ const makeMdfrChk = (data: rainChkZodType[], type: string, toDo: string) => {
 };
 
 const initFetch = async (
-  pageNo: string,
-  cnt: string,
-  txt: string | undefined,
+  pageNo: number,
+  cnt: number,
+  year: string | undefined,
   sgg: string | undefined
 ) => {
   const currentYear = new Date().getFullYear().toString();
-  const rainRes = await getFetch(
+
+  console.log("cnt ", cnt);
+  const rainRes = await getCountFetch(
     "wr",
     `/reuseChk/rainy` +
       (pageNo ? `/${pageNo}` : "/1") +
-      (cnt ? `/${cnt}` : "/20") +
-      (txt ? `/${txt}` : `/${currentYear}`) +
+      (cnt ? `/${cnt}` : "/10") +
+      (year ? `/${year}` : `/${currentYear}`) +
       (sgg ? `/${sgg}` : "/0")
   );
+
+  console.log(" rainRes ", rainRes);
   return rainRes;
 };
 
@@ -142,16 +168,24 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       }));
     },
     rainChkExcelDataUPload: async (excelData: rainChkZodType[]) => {
+      set((state: rainChkgdnType) => (
+        { rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
         const res = await postFectch("/reuseChk/rainy", excelData);
         if (res.status === 200) {
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "0");
-          return set((state: rainChkgdnState) => ({
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            commonCd
+          );
+          set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
           toast.success("지도점검 등록이 완료되었습니다.");
@@ -161,22 +195,62 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       } catch (error) {
         console.log(error);
         toast.error("지도점검 등록이 실패되었습니다.");
+      } finally {
+        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
       }
     },
     rainChkInit: async (
-      pageNo: string,
-      cnt: string,
-      searchTxt: string,
+      pageNo: number,
+      cnt: number,
+      year: string,
       sggCd: string
     ) => {
+      set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
-        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
-
+        const rainChkRes = await initFetch(pageNo, cnt, year, sggCd);
+        set((state: rainChkgdnState) => ({
+          ...state,
+          rainChkgdn: {
+            ...state.rainChkgdn,
+            rainChk: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
+            isInit: true, // 무한 루프 방지를 위해 isInit을 true로 설정
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+        // 에러가 발생하더라도 무한 루프에 빠지지 않도록 isInit을 true로 설정합니다.
+        set((state: rainChkgdnType) => ({
+          rainChkgdn: { ...state.rainChkgdn, isInit: true },
+        }));
+      } finally {
+        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
+      }
+    },
+    rainChkNmSearch: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string,
+      txt: string
+    ) => {
+      try {
+        const currentYear = new Date().getFullYear();
+        const rainChkRes = await getCountFetch(
+          "wr",
+          `/reuseChk/rainy` +
+            (pageNo ? `/${pageNo}` : "/1") +
+            (cnt ? `/${cnt}` : "/10") +
+            (year ? `/${year}` : `/${currentYear}`) +
+            (sggCd ? `/${sggCd}` : "/0") +
+            (txt ? `/${txt}` : "")
+        );
         return set((state: rainChkgdnState) => ({
           ...state,
           rainChkgdn: {
             ...state.rainChkgdn,
-            rainChk: rainChkRes,
+            rainChk: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
           },
         }));
       } catch (error) {
@@ -187,26 +261,32 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       try {
         const chData = await makeMdfrChk(rainChk, "rain", "rainDetil");
 
-        const res = await postFectch("/reuseChk/rainy", chData);
-        if (res.staus === 200) {
+        const res = await putFectch("/reuseChk/rainy/list", chData);
+        if (res) {
           toast.success(
-            "지도점검 보급수 및 밋물이용량 수정이 완료되었습니다. "
+            "지도점검 대체수 및 밋물이용량 수정이 완료되었습니다. "
           );
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
         } else {
-          toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
+          toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
         }
       } catch (error) {
         console.log(error);
-        toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
+        toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
       }
     },
     rainChkGuidUpdate: async (rainChk: rainChkZodType) => {
@@ -217,17 +297,22 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           toast.success("지도점검 수질 및 과태료 수정이 완료되었습니다. ");
 
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
-        }else{
+        } else {
           toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
-
         }
       } catch (error) {
         toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
@@ -241,17 +326,22 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           toast.success("삭제가 완료되었습니다. ");
 
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
-        }else{
+        } else {
           toast.error("삭제시 오류가 발생하였습니다.. ");
-
         }
       } catch (error) {
         toast.error("삭제시 오류가 발생하였습니다.. ");
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
index 0e690dbb9..a7fea419d 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
@@ -109,6 +109,24 @@ export const rswtChkgdZod = z.object({
   rswtrPollutions: z.array(rswtrPolutionsZode),
 });
 
+
+
+export const rswtRuseHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "ruseWater", text: "연간중수 이용량(m³)", length: 13 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+];
+
+export const rswtSplHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+  { headNm: "splWater", text: "연간대체수 이용량(m³)", length: 13 },
+];
+
+
+
 export const rswtHeadNmExport: chHeadType[] = [
   { headNm: "useQuilty", text: "연간 평균 이용수질", length: 10 },
   { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
@@ -126,7 +144,7 @@ export const rswtChkHeadListExport: TableUpperProps[] = [
   { id: "spwtPositn", title: "채수지점" ,mergeCell: true},
   { id: "chckYmd", title: "점검일" ,mergeCell: true},
   { id: "utztnUsgCd", title: "이용용도" },
-  { id: "splyUswtrUtztnQnt", title: "연간보급수이용량(m³)" ,type: "number"},
+  { id: "splyUswtrUtztnQnt", title: "연간대체수이용량(m³)" ,type: "number"},
   { id: "ruseFcltUtztnQnt", title: "연간중수도이용량(m³)",type: "number"},
 
   {
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index acc6ccaba..d40c1190c 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -1,6 +1,4 @@
-import {
-  TEST_UUID,
-} from "@/app/store/ruseFcltMng/fcltReg/rainReg";
+import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import type {
   SelectDataType,
   SheetParameter,
@@ -8,6 +6,7 @@ import type {
 import {
   deleteFectch,
   fetchType,
+  getCountFetch,
   getFetch,
   postFectch,
   putFectch,
@@ -20,15 +19,24 @@ import {
   rswtDetailHeadListExport,
   rswtHeadNmExport,
   rswtrDetailsZod,
+  rswtRuseHeadNmExport,
+  rswtSplHeadNmExport,
 } from "./headList";
 import { z } from "zod";
 import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import { type chHeadType } from "../rainChkgdn/headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import toast from "react-hot-toast";
+
+export const rswtPageSize = 10;
 
 const rswtChkHeadList = rswtChkHeadListExport;
 const rswtDetailHeadList = rswtDetailHeadListExport;
 const rswtHeadNm = rswtHeadNmExport;
+const rswtRuseHeadNm =rswtRuseHeadNmExport
+const rswtSplHeadNm =rswtSplHeadNmExport
+
+
 export type rswtChkZodType = z.infer<typeof rswtChkgdZod>;
 export type rswtrChkDetailsZodType = z.infer<typeof rswtrDetailsZod>;
 export type rswtChkgdnState = {
@@ -40,13 +48,29 @@ export type rswtChkgdnState = {
     excelList: SheetParameter[];
     rswtChkRes: rswtChkZodType[];
     rswtChkPolGuide: rswtChkZodType[];
+    rswtSplHeadNm:chHeadType[]
+    rswtRuseHeadNm:chHeadType[]
     isInit: boolean;
-    isSttn: boolean
+    isSttn: boolean;
+    isLoading:boolean;
+    rswtChkCount: number;
   };
 };
 
 type rswtChkgdnActions = {
-  rswtChkgdnInit: (pageNo: string, cnt: string, year: string, sggCd: string) => void;
+  rswtChkgdnInit: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string
+  ) => void;
+  rswtChkNmSearch: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string,
+    txt: string
+  ) => void;
   rswtrChkExcelDownload(
     sidoCode: SelectDataType[],
     sggCode: SelectDataType[]
@@ -67,27 +91,41 @@ export const rswtChkgdnStateExport: rswtChkgdnState = {
     rswtChkHeadList: rswtChkHeadList,
     rswtDetailHeadList: rswtDetailHeadList,
     rswtHeadNm: rswtHeadNm,
-    excelList: [{
-      data: [[]], headerNum: 0, headerRange: "A1:V3",
-      sheetName: "",
-      startCol: '1'
-    }],
+    rswtRuseHeadNm:rswtRuseHeadNm,
+    rswtSplHeadNm:rswtSplHeadNm,
+
+    excelList: [
+      {
+        data: [[]],
+        headerNum: 0,
+        headerRange: "A1:V3",
+        sheetName: "",
+        startCol: "1",
+      },
+    ],
     rswtChkRes: [],
     rswtChkPolGuide: [],
     isInit: false,
     isSttn: false,
+    isLoading:false,
+    rswtChkCount: 1,
   },
 };
 
-const initFetch = async (pageNo: string, cnt: string, year: string | undefined, sgg: string | undefined) => {
+const initFetch = async (
+  pageNo: number,
+  cnt: number,
+  year: string | undefined,
+  sgg: string | undefined
+) => {
   const currentYear = new Date().getFullYear().toString();
-  const rswtChkRes = await getFetch(
+  const rswtChkRes = await getCountFetch(
     "wr",
     `/reuseChk/reuseWater` +
-    (pageNo ? `/${pageNo}` : "/1") +
-    (cnt ? `/${cnt}` : "/20") +
-    (year ? `/${year}` : `/${currentYear}`) +
-    (sgg ? `/${sgg}` : "/0")
+      (pageNo ? `/${pageNo}` : "/1") +
+      (cnt ? `/${cnt}` : "/20") +
+      (year ? `/${year}` : `/${currentYear}`) +
+      (sgg ? `/${sgg}` : "/0")
   );
   return rswtChkRes;
 };
@@ -139,15 +177,59 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         },
       }));
     },
-    rswtChkgdnInit: async (pageNo: string, cnt: string, year: string, sggCd: string) => {
+    rswtChkgdnInit: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string
+    ) => {
+      set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
       try {
         const rswtChkRes = await initFetch(pageNo, cnt, year, sggCd);
 
+        set((state: rswtChkgdnState) => ({
+          ...state,
+          rswtChkgdn: {
+            ...state.rswtChkgdn,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
+            isInit: true, // 무한 루프를 방지하기 위해 isInit을 true로 설정
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+        set((state: rswtChkgdnType) => ({
+          rswtChkgdn: { ...state.rswtChkgdn, isInit: true },
+        }));
+      } finally {
+        set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
+      }
+    },
+    rswtChkNmSearch: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string,
+      txt: string
+    ) => {
+      try {
+        const currentYear = new Date().getFullYear().toString();
+        const rswtChkRes = await getCountFetch(
+          "wr",
+          `/reuseChk/reuseWater` +
+            (pageNo ? `/${pageNo}` : "/1") +
+            (cnt ? `/${cnt}` : "/20") +
+            (year ? `/${year}` : `/${currentYear}`) +
+            (sggCd ? `/${sggCd}` : "/0") +
+            (txt ? `/${txt}` : "")
+        );
+
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
             isInit: false,
           },
         }));
@@ -157,6 +239,9 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
     },
     rswtChkExceDataUpload: async (excelData: rswtChkZodType[]) => {
       try {
+   set((state: rswtChkgdnType) => (
+        { rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
+        console.log('excelData ', excelData)
         const res = await postFectch("/reuseChk/reuseWater", excelData);
         if (res.ok) {
           ToastFormUi({
@@ -165,65 +250,66 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
         console.log(error);
+      }finally{
+        set((state: rswtChkgdnType) => (
+          { rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
       }
+
     },
     rswtChkDetilsUpdate: async (rswtChk: rswtrChkDetailsZodType[]) => {
       try {
         const chData = await makeMdfrChk(rswtChk);
 
-
         const res = await putFectch("/reuseChk/reuseWater", chData);
         if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 과태료 수정 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+          toast.success("지도점검 과태료  수정이 완료되었습니다. ",)
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
         console.log(error);
-        alert("수정에 실패하였습니다.");
+        toast.error("지도점검 과태료  수정 오류입니다. ",)
+
       }
     },
     rswtChkDelete: async (chkgdnPks: number[]) => {
       try {
         const res = await deleteFectch(`/reuseChk/reuseWater`, chkgdnPks);
 
-        if (res.ok) {
-          ToastFormUi({
-            body: "삭제가 완료되었습니다. ",
-            title: "지도점검 삭제",
-          });
+        if (res) {
+          toast.success("삭제가 완료되었습니다.") 
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
-        ToastFormUi({ body: "삭제를 실패했습니다.. ", title: "지도점검 삭제" });
+        toast.error("삭제 오류입니다.") 
       }
     },
     rswtChkPolAndGuide: async (chkGdnPk: number) => {
@@ -240,7 +326,11 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: rswtChkPolGuide,
           },
         }));
-      } catch (error) { }
+      } catch (error) {
+
+
+
+      }
     },
     rswtChkPolInit: () => {
       try {
@@ -251,7 +341,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: undefined,
           },
         }));
-      } catch (error) { }
+      } catch (error) {}
     },
     rwstPolAndGuideUpdate: async (rswtChk: rswtChkZodType[]) => {
       try {
@@ -261,13 +351,10 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           chData[0]
         );
         if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 연간 수질 및 보급수/중수도 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+          toast.success("지도점검 연간 수질 및 대체수/중수도 수정이 완료되었습니다.") 
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -277,10 +364,9 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         }));
       } catch (error) {
         console.log(error);
-        ToastFormUi({
-          body: "지도점검 연간 수질 및 보급수/중수도 수정이 실패하였습니다.. ",
-          title: "지도점검 수정",
-        });
+
+        toast.error("지도점검 연간 수질 및 대체수/중수도 수정 오류입니다.") 
+
       }
     },
     rswtChkHeadChange: async (rswtChkgdn: rswtChkgdnState, isEdit: boolean) => {
@@ -301,7 +387,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtDetailHeadList: rswtDetailHeadList,
           },
         }));
-      } catch (e) { }
+      } catch (e) {}
     },
   };
 };
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index 2136dfebe..bbbb3a61e 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -2,7 +2,7 @@ import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn"
 import { getFetch } from "@/components/lib/api";
 import type { SelectDataType } from "@common/business_components/ui";
 import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
-import { rainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
+import {  rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { buildingExcelRainSttn } from "./excel";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 
@@ -15,7 +15,7 @@ const fcltDiv = [
 const rainChkgdnHeadList = rainChkgdnHeadSttnExport;
 const ruseHeadList = ruseSttnHeadListExport;
 const splHeadList = splSttnHeadListExport;
-const rainHeadNm = rainHeadNmExport
+const rainHeadNm = rainMainHeadNmExport
 
 const rainChk: rainChkZodType[] = [];
 
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx
index 91f6bf718..a505f1b0c 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/headList.tsx
@@ -11,7 +11,7 @@ export const rswtChkSttnHeadListExport: TableUpperProps[] = [
   { id: "spwtPositn", title: "채수지점", mergeCell: true },
   { id: "chckYmd", title: "점검일", mergeCell: true },
   { id: "utztnUsgCd", title: "이용용도" },
-  { id: "splyUswtrUtztnQnt", title: "연간보급수이용량(m³)", type: "number" },
+  { id: "splyUswtrUtztnQnt", title: "연간대체수이용량(m³)", type: "number" },
   { id: "ruseFcltUtztnQnt", title: "연간중수도이용량(m³)", type: "number" },
 
   {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
index 8dd2a4d6f..ef662cc8c 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/headList.tsx
@@ -426,7 +426,7 @@ export const rainSttNodeListExport: CommonTableProps[] = [
 
 export const rainSttnDetailNodeListExport:CommonTableProps[] = [
   { id: "totalSplyUswtrUtztnQnt", 
-    title: "연간보급수이용량(m³)", 
+    title: "연간대체수이용량(m³)", 
     visible: true,
     row: 1,
     rowSpan: 2,
@@ -511,7 +511,7 @@ export const rainSttnDetailNodeListExport:CommonTableProps[] = [
 
 export const rainSttnDetailHeadListExport:CommonTableProps[] = [
   { id: "totalSplyUswtrUtztnQnt", 
-    title: "연간보급수이용량(m³)", 
+    title: "연간대체수이용량(m³)", 
     visible: true,
     row: 1,
     rowSpan: 1,
diff --git a/apps/wr/components/lib/api/index.ts b/apps/wr/components/lib/api/index.ts
index 452788eb0..69bc1bb68 100644
--- a/apps/wr/components/lib/api/index.ts
+++ b/apps/wr/components/lib/api/index.ts
@@ -46,6 +46,29 @@ export const getFetch = async (type: string, url: string) => {
   }
 };
 
+
+export const getCountFetch = async (type: string, url: string) => {
+  const div =
+  type === fetchType.COMMON
+    ? DEV_URL_FO
+    : type === fetchType.LOCAL
+      ? LOCAL_URL
+      : type === fetchType.CS
+      ? ''
+      : DEV_URL_WR;
+
+  const response = await fetch(div + url, {
+    method: "GET",
+    headers: {
+      accept: "application/json",
+    },
+  });
+    // JSON 응답 처리
+    const res = await response.json();
+    return res;
+  
+};
+
 export const getFetchWithCount = async (type: string, url: string) => {
   const div =
   type === fetchType.COMMON
diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx
index 7a35e02c4..5be5d9fb3 100644
--- a/apps/wr/components/lib/func/TableData.tsx
+++ b/apps/wr/components/lib/func/TableData.tsx
@@ -54,27 +54,30 @@ export const rainChkTableData = (chkData: rainChkZodType[]) => {
 export const rswtChkTableData = (chkData: rswtChkZodType[]) => {
   // 1. chkgdnFk + utztnUsgCd 기준 누계 정보 만들기
   const makeRswtData: any[] = [];
-  chkData?.forEach((root) => {
-    root.rswtrDetails.forEach((detail) => {
-      let flatRswtChk = {};
-      const findGuide = root.guideDetails.find(
-        (guide) => guide.utztnUsgCd === detail.utztnUsgCd
-      );
-      const findPoluttion = root.rswtrPollutions.find(
-        (polution) => polution.utztnUsgCd === detail.utztnUsgCd
-      );
-      const operMngCd = root?.reuseBuilding.operMngCd;
-      flatRswtChk = {
-        ...root,
-        ...detail,
-        ...findGuide,
-        ...findPoluttion,
-        ...flatRswtChk,
-        operMngCd: operMngCd,
-      };
-      makeRswtData.push(flatRswtChk);
+  if(chkData&& chkData.length>0){
+
+    chkData?.forEach((root) => {
+      root.rswtrDetails.forEach((detail) => {
+        let flatRswtChk = {};
+        const findGuide = root.guideDetails.find(
+          (guide) => guide.utztnUsgCd === detail.utztnUsgCd
+        );
+        const findPoluttion = root.rswtrPollutions.find(
+          (polution) => polution.utztnUsgCd === detail.utztnUsgCd
+        );
+        const operMngCd = root?.reuseBuilding.operMngCd;
+        flatRswtChk = {
+          ...root,
+          ...detail,
+          ...findGuide,
+          ...findPoluttion,
+          ...flatRswtChk,
+          operMngCd: operMngCd,
+        };
+        makeRswtData.push(flatRswtChk);
+      });
     });
-  });
+  }
   return makeRswtData;
 };
 
diff --git a/apps/wr/components/lib/func/commom.tsx b/apps/wr/components/lib/func/commom.tsx
index 8569d4eb3..50e425722 100644
--- a/apps/wr/components/lib/func/commom.tsx
+++ b/apps/wr/components/lib/func/commom.tsx
@@ -165,18 +165,34 @@ export const yearOptions: { val: string; text: string }[] = Array.from(
   })
 );
 
-export const getdmdMatFlag = (flag: string|undefined) => {
-  let flagMat = "";
-
-  if(flag === undefined || flag === null) {
-    flagMat = "신청";
-  }else if(flag.trim() === "Sub") {
-    flagMat = "검토";
-
-  }else if(flag.trim() === "matched") {
-    flagMat = "매칭완료";
-  }else {
-    flagMat = "신청";
+export const getdmdMatFlag = (flag: string | undefined | null): string => {
+  // 1. undefined나 null인 경우, '신청'을 반환합니다.
+  //    (이 검사를 먼저 함으로써 아래에서 .trim()을 안전하게 사용할 수 있습니다.)
+  if (flag == null) {
+    return "신청";
   }
-  return flagMat;
+
+  // 2. 이제 flag가 문자열임이 보장되므로 .trim()을 호출해 앞뒤 공백을 제거합니다.
+  const trimmedFlag = flag.trim();
+
+  if (trimmedFlag === "Sub") {
+    return "검토";
+  } else if (trimmedFlag === "matched") {
+    return "매칭완료";
+  }
+  // 3. 그 외 모든 경우(빈 문자열 포함)는 '신청'으로 처리합니다.
+  return "신청";
 };
+
+
+
+export const formatPhoneNumber=(tel:string) => {
+  const onlyNums = tel.replace(/[^0-9]/g, '');
+  if (onlyNums.length === 10) {
+    return onlyNums.replace(/(\d{2})(\d{4})(\d{4})/, '$1-$2-$3');
+  } else if (onlyNums.length === 11) {
+    return onlyNums.replace(/(\d{3})(\d{4})(\d{4})/, '$1-$2-$3');
+  } else {
+    return tel; // 유효하지 않으면 빈 문자열
+  }
+}
\ No newline at end of file
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index b22f9474e..3d59d0a61 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -368,7 +368,7 @@ export default function ConCostForm({
               childrenTriger={
                 <>
                   <Label className="underline">
-                    총사업비 (백만원) <i className="diveicon di-search" />
+                  처리시설 총사업비(백만원) <i className="diveicon di-search" />
                   </Label>
                 </>
               }
@@ -405,7 +405,7 @@ export default function ConCostForm({
               )}
             />
           </div>
-          <div className="col-span-3 mt-4">
+          {/* <div className="col-span-3 mt-4">
             <div className="flex items-center justify-between">
               <Label>공급처 선정</Label>
               <Button size={"sm"} onClick={(e) => {}} className="bg-none">
@@ -428,7 +428,7 @@ export default function ConCostForm({
                 </FormUi>
               )}
             />
-          </div>
+          </div> */}
           <div className="col-span-4 mt-4">
             <FormField
               control={form.control}
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
index 8828420b8..5aa67fd3a 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
@@ -7,11 +7,9 @@ import {
   excelToRswtGuideData,
   excelToRswtPolution,
 } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import {
   filePicked,
   filePickedArray,
-  FileUpload,
   Form,
   FormField,
   FormUi,
@@ -26,7 +24,7 @@ import { useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import type { z } from "zod";
 
-export default function ChkgdExcel({ type }: { type: string }) {
+export default function ChkgdExcel({ type,setIsRegExcel  }: { type: string, setIsRegExcel:(open:boolean) =>void }) {
   const { rswtChkgdn, rainChkExcelDataUPload, rswtChkExceDataUpload } =
     useWrStore((state) => {
       return state;
@@ -146,29 +144,28 @@ export default function ChkgdExcel({ type }: { type: string }) {
 
   const onSubmit = (values: z.infer<typeof chkgdRegExcel>) => {
     if (values.chckYr === "") {
-      ToastFormUi({ body: "등록년도를 작성해주세요", title: "지도점검 등록" });
+      toast.error("등록년도를 작성해주세요");
       return;
     }
 
     if (type === "RNB") {
       if (excelData === undefined || excelData?.length === 0) {
-        ToastFormUi({
-          body: "빈 파일 및 파일 오류 입니다.",
-          title: "지도점검 등록",
-        });
+        toast.error("빈 파일 및 파일 오류 입니다.");
+
         return;
       } else {
         rainChkExcelDataUPload(excelData as rainChkZodType[]);
+        setIsRegExcel(false)
       }
     } else if (type === "RST") {
       if (excelRswtData === undefined || excelRswtData?.length === 0) {
-        ToastFormUi({
-          body: "빈 파일 및 파일 오류 입니다.",
-          title: "중수지도점검 등록",
-        });
+        toast.error("빈 파일 및 파일 오류 입니다.");
+
         return;
       } else {
         rswtChkExceDataUpload(excelRswtData as rswtChkZodType[]);
+        setIsRegExcel(false)
+
       }
     }
   };
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
index 965bc7275..d62406e9f 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
@@ -10,7 +10,7 @@ import type { z } from "zod";
 import React from "react";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 
-export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
+export default function ChkgdModal({ type, obj ,setIsModal }: { type: string; obj: any , setIsModal:(open:boolean)=>void}) {
   const {
     rainChkgdn,
     rswtChkgdn,
@@ -79,6 +79,8 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
   ]);
 
   useEffect(() => {
+    console.log('obj ', obj)
+
     const result = obj.guideDetails?.reduce((acc: any, cur: any) => {
       const code = cur.utztnUsgCd;
       const month = cur.ym?.slice(4); // "MM"
@@ -114,9 +116,10 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
       });
     }
 
-    console.log("result  ", result);
     setGuidData(result as splRuseWaterType[]);
 
+
+    console.log('obj ', obj)
     if (obj.rswtrPollutions) {
       const resultPolution: Record<string, any[]> = {
         "1": [],
@@ -217,12 +220,14 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
     obj.guideDetails = realGuideDetail;
     if (type === "RNB") {
       rainChkGuidUpdate(obj);
+      setIsModal(false)
     } else {
       const polution = Object.values(upPolutionData)
         .flat()
         .filter((item) => item.utztnUsgCd !== "평균");
       obj.rswtrPollutions = polution;
       rwstPolAndGuideUpdate([obj]);
+      setIsModal(false)
     }
   };
 
@@ -262,12 +267,13 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
         <ScrollArea className="h-[60vh]">
           <div className="card-header">
             <h3 className="text-2xl font-medium text-label">
-              {`연간보급수이용량`}
+              {`연간대체수이용량`}
             </h3>
           </div>
           <GuideDetailsTable
             chgRes={guidData || []}
-            headList={headList.ruseHeadList}
+            headList={headList.splHeadList}
+            upheadList={type === "RNB"?  rainChkgdn.rainSplHeadNm :rswtChkgdn.rswtSplHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
@@ -280,7 +286,8 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
           </div>
           <GuideDetailsTable
             chgRes={guidData || []}
-            headList={headList.splHeadList}
+            headList={headList.ruseHeadList}
+            upheadList={type === "RNB"?  rainChkgdn.rainRuseHeadNm :rswtChkgdn.rswtRuseHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
@@ -302,6 +309,7 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
                     <GuideDetailsTable
                       chgRes={value}
                       headList={headList?.rswtDetailHeadList}
+                      upheadList={rswtChkgdn.rswtSplHeadNm}
                       type={""}
                       setChGuidData={(data) => {
                         getPolutionData(data);
diff --git a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
index 94be4ebb6..2bf33e7c2 100644
--- a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
@@ -4,6 +4,7 @@ import { useWrStore } from "@/app/store";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import type {
 } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { InputTableBody } from "@/components/lib/func/TableData";
 import {
   Input,
@@ -18,11 +19,13 @@ import {  useEffect, useState, type Dispatch, type SetStateAction } from "react"
 export function GuideDetailsTable({
   chgRes,
   headList,
+  upheadList,
   type,
   setChGuidData,
 }: {
   chgRes: any[];
   headList: TableUpperProps[]; 
+  upheadList:chHeadType[]
   type: string;
   setChGuidData: (chgRes: any[]) => void;
 }) {
@@ -44,7 +47,7 @@ export function GuideDetailsTable({
     <>
   <div className={`card !m-[1.2rem] !p-0r `}> 
       <Table variant="secondary">
-        <TableHeader className="font-bold">{headMakeprfmnc(headList, rainChkgdn?.rainHeadNm)}</TableHeader>
+        <TableHeader className="font-bold">{headMakeprfmnc(headList, upheadList)}</TableHeader>
         <TableBody >
          {InputTableBody(inputData ?? [],headList, setInputData) }
         </TableBody>
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index 720a73ab4..c6daac3b6 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
 import { useWrStore } from "@/app/store";
-import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import { rainPageSize, type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import { tableData } from "@/components/lib/func/commom";
@@ -17,6 +17,7 @@ import {
 } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
 import UiPageNations from "@common/business_components/ui/table/uiPageNations";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
 export default function RainChkgdTable({
   detailUp,
   handleClick = () => { },
@@ -70,16 +71,12 @@ export default function RainChkgdTable({
   }, [makeTableData, handleClick]);
 
 
-  useEffect(() =>{
-
-
-  },[rainChkgdn.rainChk])
 
   useEffect(() => {
     setSelectedIds([])// 셀렉트 초기화를 위한 작업
-    if (rainChkData) {
+    if (rainChkData&&rainChkData.length>0) {
 
-      const rainChg = rainChkData.map((item: any) => {
+      const rainChg = rainChkData?.map((item: any) => {
         const bud = tableData([item.building], { code });
         return {
           ...item,
@@ -89,6 +86,8 @@ export default function RainChkgdTable({
       });
 
       setMakeTableData(rainChkTableData(rainChg));
+    }else{
+      setMakeTableData([]);
     }
   }, [rainChkData, code]);
 
@@ -167,7 +166,7 @@ export default function RainChkgdTable({
     } else {
       setHeadList({
         headList: rainChkgdn.rainChkgdnHeadList,
-        upHeadList: rainChkgdn.rainHeadNm
+        upHeadList: rainChkgdn.rainMainHeadNm
       })
 
     }
@@ -175,9 +174,15 @@ export default function RainChkgdTable({
   }, [rainChkSttn.isSttn, rainChkgdn.rainChkgdnHeadList, rainChkSttn.rainChkgdnHeadList]);
 
 
+  useEffect(() =>{
+    console.log('rainChkgdn.count ', rainChkgdn.rainChkCount)
+  },[rainChkgdn.rainChkCount])
+
   return (
     <>
+      <LoadingOverlay isLoading={rainChkgdn.isLoading}></LoadingOverlay>
       <Table variant="secondary">
+
         <TableHeader className="font-bold">
           {headMakeprfmnc(
             headList?.headList,
@@ -197,9 +202,9 @@ export default function RainChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rainChkData?.length ?? 0}
+        total={rainChkgdn.rainChkCount||20}
         cur={pageNation}
-        pageSize={20}
+        pageSize={rainPageSize}
         onPageChange={onPageChange}
       />
     </>
diff --git a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
index 31891a595..5264dcdee 100644
--- a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
@@ -2,9 +2,10 @@
 import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
 import { useWrStore } from "@/app/store";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
-import type {
-  rswtChkZodType,
-  rswtrChkDetailsZodType,
+import {
+  rswtPageSize,
+  type rswtChkZodType,
+  type rswtrChkDetailsZodType,
 } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import { tableData } from "@/components/lib/func/commom";
@@ -15,6 +16,7 @@ import {
 import { Table, TableBody, TableHeader } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
 import UiPageNations from "@common/business_components/ui/table/uiPageNations";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
 
 export default function RswtChkgdTable({
   detaiRswtlUpdate,
@@ -72,7 +74,6 @@ export default function RswtChkgdTable({
   }, [rswtChkgdn.rswtChkPolGuide]);
 
   useEffect(() => {
-    console.log("makeTableData ", makeTableData)
     getRswtSttnExcel(makeTableData)
     const selectedData = makeTableData
       .map((item) => {
@@ -133,6 +134,7 @@ export default function RswtChkgdTable({
 
   return (
     <>
+      <LoadingOverlay isLoading={rswtChkgdn.isLoading}></LoadingOverlay>
       <Table variant="secondary">
         <TableHeader className="font-bold">
           {headMakeprfmnc(headList?.headList, headList?.upHeadList)}
@@ -150,9 +152,9 @@ export default function RswtChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rswtChkData?.length ?? 0}
+        total={rswtChkgdn.rswtChkCount}
         cur={pageNation}
-        pageSize={20}
+        pageSize={rswtPageSize}
         onPageChange={onPageChange}
       />
     </>

From f592ab31d86a86ce305ce8b4a65170340d03186a Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Fri, 4 Jul 2025 13:10:23 +0900
Subject: [PATCH 22/44] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=A0=90=EA=B2=80?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20=ED=98=84=ED=99=A9=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=88=98=EC=A0=95,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  |  5 +-
 .../prfmncSttn/chkgdnSttn/page.tsx            | 40 ++++++++++---
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  |  5 +-
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx |  4 +-
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       | 58 +++++++++++--------
 .../chkgdnSttn/rswtChkgdnSttn/index.tsx       | 32 +++++-----
 .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx  | 21 ++++---
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   | 14 ++---
 .../chkgdTable/rswtChkgd/rswtChkgdTable.tsx   |  4 +-
 9 files changed, 107 insertions(+), 76 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index 033d3a23d..328bb8b88 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -315,7 +315,7 @@ export default function Page() {
                     </Tooltip>
                   </TooltipProvider>
 
-               
+
                   <Button
                     size={"sm"}
                     onClick={() => {
@@ -344,7 +344,7 @@ export default function Page() {
                 rainChkData={rainChkgdn.rainChk}
                 pageNation={rainPageNation}
                 onPageChange={rainPageChange}
-              />
+                pageCount={rainChkgdn.rainChkCount} />
             ) : (
               <RswtChkgdTable
                 detaiRswtlUpdate={setUpdateRSwtDetail}
@@ -353,6 +353,7 @@ export default function Page() {
                 rswtChkData={rswtChkgdn.rswtChkRes}
                 pageNation={rswtPageNation}
                 onPageChange={rswtPageChange}
+                pageCount={rswtChkgdn.rswtChkCount}
               />
             )}
           </ListDiv>
diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
index 8960f468d..60040833b 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import { useWrStore } from "@/app/store";
+import { commonCd, rainPageSize } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import { rswtPageSize } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import {
   excelDownload,
   yearOptions
@@ -39,6 +41,8 @@ export default function Page() {
   });
 
   const [selFcltDiv, setSelFcltDiv] = useState("RNB");
+  const [rainPageNation, setRainPageNation] = useState(1);
+  const [rswtPageNation, setRswtPageNation] = useState(1);
   const [isModal, setIsModal] = useState({
     open: false,
     data: {},
@@ -47,29 +51,43 @@ export default function Page() {
   const cellClick = () => {
     if (searchYear) {
       if (selFcltDiv === "RNB") {
-        rainChkSttnSearch(searchYear, "0");
+        rainChkSttnSearch(rainPageNation, rainPageSize, searchYear, commonCd);
       } else {
-        rswtChkSttnSearch(searchYear, "0");
+        rswtChkSttnSearch(rswtPageNation, rswtPageSize, searchYear, commonCd);
       }
     }
   };
 
+  const rainPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRainPageNation(pageNo);
+      rainChkSttnInit(pageNo, rainPageSize, searchYear, commonCd);
+    }
+  };
+
+  const rswtPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRswtPageNation(pageNo);
+      rswtChkSttnInit(pageNo, rswtPageSize, searchYear, commonCd);
+    }
+  };
+
   useEffect(() => {
     if (!rainChkSttn.isInit) {
       isRainSttn(true)
-      rainChkSttnInit(new Date().getFullYear().toString(), "0");
+      rainChkSttnInit(1, rainPageSize, new Date().getFullYear().toString(), commonCd);
       setIsModal({ data: {}, open: false });
     }
-  }, [rainChkSttn.isInit, rainChkSttnInit]);
+  }, [rainChkSttn.isInit, rainChkSttnInit, rainPageSize]);
 
   useEffect(() => {
-
     if (!rswtChkSttn.isInit) {
       setIsModal({ data: {}, open: false });
-      rswtChkSttnInit(new Date().getFullYear().toString(), "0");
+      rswtChkSttnInit(1, rswtPageSize, new Date().getFullYear().toString(), commonCd);
       isRswtSttn(true)
     }
-  }, [rswtChkSttn.isInit, rswtChkSttnInit])
+  }, [rswtChkSttn.isInit, rswtChkSttnInit, rswtPageSize])
+
 
 
   const handleClick = useCallback(
@@ -163,6 +181,9 @@ export default function Page() {
                 detailUp={() => { }}
                 handleClick={handleClick}
                 rainChkData={rainChkSttn.rainChkRes}
+                pageNation={rainPageNation}
+                onPageChange={rainPageChange}
+                pageCount={rainChkSttn.rainChkCount}
               />
             ) : (
               <RswtChkgdTable
@@ -170,6 +191,9 @@ export default function Page() {
                 deleteRswtData={() => { }}
                 handleRswtClick={handleClick}
                 rswtChkData={rswtChkSttn.rswtChkRes}
+                pageNation={rswtPageNation}
+                onPageChange={rswtPageChange}
+                pageCount={rswtChkSttn.rswtChkCount}
               />
             )}
           </ListDiv>
@@ -181,7 +205,7 @@ export default function Page() {
           setIsModal({ open: !open, data: {} });
         }}
         bodyClass={"w-[80vw] max-w-none"}
-        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} />}
+        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} setIsModal={() => { }} />}
       ></UiModal>
       <Toaster position="top-center" />
     </ContentsDiv>
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 63d2d1d03..36dd0a815 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -24,7 +24,7 @@ import {
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import toast from "react-hot-toast";
 
-export const rainPageSize = 10;
+export const rainPageSize = 5;
 export const commonCd = "41";
 
 export type rainChkZodType = z.infer<typeof rainChkZod>;
@@ -132,7 +132,6 @@ const initFetch = async (
 ) => {
   const currentYear = new Date().getFullYear().toString();
 
-  console.log("cnt ", cnt);
   const rainRes = await getCountFetch(
     "wr",
     `/reuseChk/rainy` +
@@ -142,7 +141,6 @@ const initFetch = async (
       (sgg ? `/${sgg}` : "/0")
   );
 
-  console.log(" rainRes ", rainRes);
   return rainRes;
 };
 
@@ -193,7 +191,6 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           toast.error("지도점검 등록이 실패되었습니다.");
         }
       } catch (error) {
-        console.log(error);
         toast.error("지도점검 등록이 실패되었습니다.");
       } finally {
         set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index d40c1190c..6e0a805b6 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -28,7 +28,7 @@ import { type chHeadType } from "../rainChkgdn/headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import toast from "react-hot-toast";
 
-export const rswtPageSize = 10;
+export const rswtPageSize = 5;
 
 const rswtChkHeadList = rswtChkHeadListExport;
 const rswtDetailHeadList = rswtDetailHeadListExport;
@@ -43,7 +43,6 @@ export type rswtChkgdnState = {
   rswtChkgdn: {
     rswtChkHeadList: TableUpperProps[];
     rswtDetailHeadList: TableUpperProps[];
-
     rswtHeadNm: chHeadType[];
     excelList: SheetParameter[];
     rswtChkRes: rswtChkZodType[];
@@ -241,7 +240,6 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
       try {
    set((state: rswtChkgdnType) => (
         { rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
-        console.log('excelData ', excelData)
         const res = await postFectch("/reuseChk/reuseWater", excelData);
         if (res.ok) {
           ToastFormUi({
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index bbbb3a61e..895f096ef 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -1,8 +1,8 @@
 import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import { getFetch } from "@/components/lib/api";
+import { getCountFetch, getFetch } from "@/components/lib/api";
 import type { SelectDataType } from "@common/business_components/ui";
 import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
-import {  rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
+import { rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { buildingExcelRainSttn } from "./excel";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 
@@ -24,20 +24,21 @@ export type rainChkSttnState = {
     rainChkRes: rainChkZodType[];
     fcltDiv: SelectDataType[];
     rainChkgdnHeadList: TableUpperProps[];
-    rainHeadNm:chHeadType[];
+    rainHeadNm: chHeadType[];
     ruseHeadList: TableUpperProps[];
     splHeadList: TableUpperProps[];
-    sttnExcelList:[]
+    sttnExcelList: []
     isInit: boolean;
-    isSttn:boolean;
+    isSttn: boolean;
+    rainChkCount: number;
   };
 };
 
 type rainChkSttnActions = {
-  rainChkSttnInit: (searchTxt: string, sggCd: string) => void;
-  rainChkSttnSearch:  (searchTxt: string, sggCd: string) => void;
-  isRainSttn:(isSttn:boolean) => void;
-  getRainSttnExcel:(excelList:rainChkZodType[]) => void;
+  rainChkSttnInit: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
+  rainChkSttnSearch: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
+  isRainSttn: (isSttn: boolean) => void;
+  getRainSttnExcel: (excelList: rainChkZodType[]) => void;
 };
 
 export type rainChkSttnType = rainChkSttnState & rainChkSttnActions;
@@ -49,18 +50,23 @@ export const rainChkSttnStateExport: rainChkSttnState = {
     rainChkgdnHeadList: rainChkgdnHeadList,
     ruseHeadList: ruseHeadList,
     splHeadList: splHeadList,
-    rainHeadNm:rainHeadNm, 
+    rainHeadNm: rainHeadNm,
     isInit: false,
-    sttnExcelList:[],
-    isSttn:false,
+    sttnExcelList: [],
+    isSttn: false,
+    rainChkCount: 1,
   },
 };
 
-const initFetch = async (txt: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: number, cnt: number, txt: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
-  const rainRes = await getFetch(
+  const rainRes = await getCountFetch(
     "wr",
-    `/reuseChk/rainy/` + (txt ? `${txt}` : currentYear) + (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/rainy` +
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/5") +
+    (txt ? `/${txt}` : `/${currentYear}`) +
+    (sgg ? `/${sgg}` : "/0")
   );
   return rainRes;
 };
@@ -68,48 +74,50 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
   set: any
 ) => {
   return {
-    rainChkSttnInit: async (searchTxt: string, sggCd: string) => {
+    rainChkSttnInit: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rainChkRes = await initFetch(searchTxt, sggCd);
+        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
         return set((state: rainChkSttnState) => ({
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            rainChkRes:rainChkRes
+            rainChkRes: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
+            isSttn: true
           },
         }));
       } catch (error) {
         console.log(error);
       }
     },
-    rainChkSttnSearch: async (searchTxt: string, sggCd: string) => {
+    rainChkSttnSearch: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rainChkRes = await initFetch(searchTxt, sggCd);
+        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
         return set((state: rainChkSttnState) => ({
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            rainChkRes:rainChkRes
+            rainChkRes: rainChkRes
           },
         }));
       } catch (error) {
         console.log(error);
       }
-    },isRainSttn :(isSttn:boolean) =>{
+    }, isRainSttn: (isSttn: boolean) => {
       try {
         return set((state: rainChkSttnState) => ({
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            isSttn:isSttn
+            isSttn: isSttn
           },
         }));
       } catch (error) {
         console.log(error);
       }
-    },getRainSttnExcel: async (excelList:rainChkZodType[]) => {
+    }, getRainSttnExcel: async (excelList: rainChkZodType[]) => {
       try {
 
         const excelData = buildingExcelRainSttn(excelList)
@@ -118,7 +126,7 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            sttnExcelList:excelData
+            sttnExcelList: excelData
           },
         }));
       } catch (error) {
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
index cd95ef1fc..519cd39b2 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
@@ -3,7 +3,7 @@ import { rswtChkSttnHeadListExport, rswtDetailSttnHeadListExport } from "./headL
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { rswtChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
-import { getFetch } from "@/components/lib/api";
+import { getCountFetch, getFetch } from "@/components/lib/api";
 import { buildingExcelRswtSttn } from "./excel";
 
 const rswtChkHeadList = rswtChkSttnHeadListExport;
@@ -20,14 +20,15 @@ export type rswtChkSttnState = {
     rswtChkRes: rswtChkZodType[];
     isInit: boolean;
     isSttn: boolean;
+    rswtChkCount: number;
   };
 };
 
 type rswtChkSttnActions = {
-  rswtChkSttnInit: (searchTxt: string, sggCd: string) => void;
+  rswtChkSttnInit: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
   isRswtSttn: (isSttn: boolean) => void;
   getRswtSttnExcel: (excelList: rswtChkZodType[]) => void;
-  rswtChkSttnSearch: (searchTxt: string, sggCd: string) => void;
+  rswtChkSttnSearch: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
 };
 
 export type rswtChkSttnType = rswtChkSttnState & rswtChkSttnActions;
@@ -41,15 +42,18 @@ export const rswtChkStateExport: rswtChkSttnState = {
     rswtChkRes: [],
     isInit: false,
     isSttn: false,
+    rswtChkCount: 1,
   },
 };
 
-const initFetch = async (year: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: number, cnt: number, year: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
-  const rswtChkRes = await getFetch(
+  const rswtChkRes = await getCountFetch(
     "wr",
-    `/reuseChk/reuseWater/` +
-    (year ? `${year}` : currentYear) +
+    `/reuseChk/reuseWater` +
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/20") +
+    (year ? `/${year}` : `/${currentYear}`) +
     (sgg ? `/${sgg}` : "/0")
   );
   return rswtChkRes;
@@ -60,14 +64,15 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
   set: any
 ) => {
   return {
-    rswtChkSttnInit: async (searchTxt: string, sggCd: string) => {
+    rswtChkSttnInit: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rswtChkRes = await initFetch(searchTxt, sggCd);
+        const rswtChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
         return set((state: rswtChkSttnState) => ({
           ...state,
           rswtChkSttn: {
             ...state.rswtChkSttn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
             isInit: false,
           },
         }));
@@ -104,15 +109,16 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
         console.log(error);
       }
     },
-    rswtChkSttnSearch: async (searchTxt: string, sggCd: string) => {
+    rswtChkSttnSearch: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rswtChkRes = await initFetch(searchTxt, sggCd);
+        const rswtChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
         return set((state: rswtChkSttnState) => ({
           ...state,
           rswtChkSttn: {
             ...state.rswtChkSttn,
-            rswtChkRes: rswtChkRes
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
index d62406e9f..515c74490 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
@@ -1,16 +1,14 @@
 import { useWrStore } from "@/app/store";
-import { ScrollArea, Title } from "@common/business_components/ui";
-import { Button } from "@common/components/ui";
-import { useEffect, useState } from "react";
-import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
-import { GuideDetailsTable } from "@/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable";
+import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { splRuseWaterType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { rswtrPolutionsZode } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
+import { GuideDetailsTable } from "@/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable";
+import { ScrollArea, Title } from "@common/business_components/ui";
+import { Button } from "@common/components/ui";
+import React, { useEffect, useState } from "react";
 import type { z } from "zod";
-import React from "react";
-import type { TableUpperProps } from "@/app/store/common/type/header";
 
-export default function ChkgdModal({ type, obj ,setIsModal }: { type: string; obj: any , setIsModal:(open:boolean)=>void}) {
+export default function ChkgdModal({ type, obj, setIsModal }: { type: string; obj: any, setIsModal: (open: boolean) => void }) {
   const {
     rainChkgdn,
     rswtChkgdn,
@@ -253,7 +251,8 @@ export default function ChkgdModal({ type, obj ,setIsModal }: { type: string; ob
         </div>
         <div className="flex justify-between">
           <h3 className="text-2xl font-bold text-gray-900 mt-2 ml-6">
-            {`(${obj.bdstNm})`}
+            {type === "RNB"
+              ? `(${obj.bdstNm})` : `(${obj.building.bdstNm})`}
           </h3>
           {!rainChkSttn.isSttn ? (
             <Button className="" onClick={allDataUpdate}>
@@ -273,7 +272,7 @@ export default function ChkgdModal({ type, obj ,setIsModal }: { type: string; ob
           <GuideDetailsTable
             chgRes={guidData || []}
             headList={headList.splHeadList}
-            upheadList={type === "RNB"?  rainChkgdn.rainSplHeadNm :rswtChkgdn.rswtSplHeadNm}
+            upheadList={type === "RNB" ? rainChkgdn.rainSplHeadNm : rswtChkgdn.rswtSplHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
@@ -287,7 +286,7 @@ export default function ChkgdModal({ type, obj ,setIsModal }: { type: string; ob
           <GuideDetailsTable
             chgRes={guidData || []}
             headList={headList.ruseHeadList}
-            upheadList={type === "RNB"?  rainChkgdn.rainRuseHeadNm :rswtChkgdn.rswtRuseHeadNm}
+            upheadList={type === "RNB" ? rainChkgdn.rainRuseHeadNm : rswtChkgdn.rswtRuseHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index c6daac3b6..687b27611 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -25,6 +25,7 @@ export default function RainChkgdTable({
   rainChkData,
   pageNation,
   onPageChange,
+  pageCount,
 }: {
   detailUp: (data: rainChkZodType[]) => void;
   handleClick?: (data: any) => void;
@@ -32,6 +33,7 @@ export default function RainChkgdTable({
   rainChkData?: rainChkZodType[];
   pageNation: number;
   onPageChange: (page: number) => void;
+  pageCount: number;
 }) {
   const { code, rainChkgdn, rainChkSttn, getRainSttnExcel } = useWrStore((state) => state);
   const [makeTableData, setMakeTableData] = useState<any[]>([]);
@@ -74,7 +76,7 @@ export default function RainChkgdTable({
 
   useEffect(() => {
     setSelectedIds([])// 셀렉트 초기화를 위한 작업
-    if (rainChkData&&rainChkData.length>0) {
+    if (rainChkData && rainChkData.length > 0) {
 
       const rainChg = rainChkData?.map((item: any) => {
         const bud = tableData([item.building], { code });
@@ -86,7 +88,7 @@ export default function RainChkgdTable({
       });
 
       setMakeTableData(rainChkTableData(rainChg));
-    }else{
+    } else {
       setMakeTableData([]);
     }
   }, [rainChkData, code]);
@@ -170,14 +172,8 @@ export default function RainChkgdTable({
       })
 
     }
-
   }, [rainChkSttn.isSttn, rainChkgdn.rainChkgdnHeadList, rainChkSttn.rainChkgdnHeadList]);
 
-
-  useEffect(() =>{
-    console.log('rainChkgdn.count ', rainChkgdn.rainChkCount)
-  },[rainChkgdn.rainChkCount])
-
   return (
     <>
       <LoadingOverlay isLoading={rainChkgdn.isLoading}></LoadingOverlay>
@@ -202,7 +198,7 @@ export default function RainChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rainChkgdn.rainChkCount||20}
+        total={pageCount}
         cur={pageNation}
         pageSize={rainPageSize}
         onPageChange={onPageChange}
diff --git a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
index 5264dcdee..e71238706 100644
--- a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
@@ -25,6 +25,7 @@ export default function RswtChkgdTable({
   rswtChkData,
   pageNation,
   onPageChange,
+  pageCount,
 }: {
   detaiRswtlUpdate: (data: rswtrChkDetailsZodType[]) => void;
   handleRswtClick?: (data: any) => void;
@@ -32,6 +33,7 @@ export default function RswtChkgdTable({
   rswtChkData: rswtChkZodType[];
   pageNation: number;
   onPageChange: (page: number) => void;
+  pageCount: number;
 }) {
   const { code, rswtChkgdn, rswtChkSttn, rswtChkgdnInit, rswtChkPolAndGuide, getRswtSttnExcel } = useWrStore(
     (state) => state
@@ -152,7 +154,7 @@ export default function RswtChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rswtChkgdn.rswtChkCount}
+        total={pageCount}
         cur={pageNation}
         pageSize={rswtPageSize}
         onPageChange={onPageChange}

From f379425fa70a01650bc49f661afd7a9ecfbdab7d Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Fri, 4 Jul 2025 13:31:24 +0900
Subject: [PATCH 23/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/htdflReg/page.tsx | 25 +++++++++++++---
 .../app/ruseFcltMng/fcltReg/rainReg/page.tsx  |  4 +++
 .../app/ruseFcltMng/fcltReg/rswtReg/page.tsx  |  8 ++++-
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  | 12 ++++----
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx |  6 ----
 .../ruseFcltMng/fcltReg/htdflReg/index.tsx    | 30 ++++++++++++++-----
 .../ruseFcltMng/fcltReg/rainReg/index.tsx     |  2 +-
 .../ruseFcltMng/fcltReg/rainReg/type.tsx      |  6 ++--
 .../ruseFcltMng/fcltReg/rswtReg/index.tsx     | 24 +++++++--------
 .../ui/form/fcltReg/bdstReg/bdstReg.tsx       | 10 +++----
 .../ui/form/fcltReg/rainReg/rainRegForm.tsx   |  1 +
 .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 21 +++++++++----
 12 files changed, 97 insertions(+), 52 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
index 33cfa3bba..3016314a2 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
@@ -23,7 +23,7 @@ import type { customHtdflBdst } from "@/app/store/ruseFcltMng/fcltReg/htdflReg";
 import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 
 export default function Home() {
-  const { code, htdfl, initHtdfl, getHtdflBdstData } = useWrStore(
+  const { code, htdfl, initHtdflReg, getHtdflBdstData ,htdflNmSearch} = useWrStore(
     (state) => state
   );
   const [searchTxt, setSearchTxt] = useState("");
@@ -42,18 +42,27 @@ export default function Home() {
 
   useEffect(() => {
     if (!htdfl.isInit) {
+      initHtdflReg('0')
     }
-  }, [htdfl.isInit, initHtdfl]);
+  }, [htdfl.isInit, initHtdflReg]);
   useEffect(() => {
-    if (code.sggCd.length > 0) {
+    if (htdflRes&&htdflRes.length>0) {
+
+      console.log('htdflRes ', htdflRes)
       const htdflData = tableData(htdflRes, { code }).map(
         (item: customHtdflBdst) => {
+          let archArea = item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
+
           return {
             ...item,
+            archArea:archArea
+
           };
         }
       );
       setbdstTable(htdflData);
+    }else{
+      setbdstTable([]);
     }
   }, [code, htdflRes]);
 
@@ -104,7 +113,15 @@ export default function Home() {
                   <Button
                     size={"sm"}
                     onClick={() => {
-                      initHtdfl(searchTxt || "");
+                      console.log(' 조회가 없어11')
+                      if(searchTxt&&searchTxt.length>0){
+                        htdflNmSearch(String(0),searchTxt)
+                      }else{
+
+                        console.log(' 조회가 없어')
+                        initHtdflReg(String(0) );
+
+                      }
                     }}
                   >
                     조회
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
index b468fad03..f954ce7f7 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
@@ -51,8 +51,12 @@ export default function Home() {
     if (code.sggCd.length > 0) {
       const rainData = tableData(rainRes, { code }).map(
         (item: customRainBdst) => {
+
+        let archArea = item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
+        
           return {
             ...item,
+            archArea:archArea,
             bdstChgYn: item.chgBuilding.length > 0 ? "Y" : "N",
           };
         }
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
index ea0dea649..cd91a7fbc 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
@@ -20,6 +20,7 @@ import {
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components";
 import { useEffect, useState } from "react";
+import { Toaster } from "react-hot-toast";
 
 export default function Home() {
   const { code, rswt, initRswt, rswtBdstSearch, getRswtBdstData } = useWrStore(
@@ -45,8 +46,12 @@ export default function Home() {
     if (code.sggCd.length > 0 && rswtRes?.length > 0) {
       const rswtData = tableData(rswtRes, { code })?.map(
         (item: customRswtBdst) => {
+
+          let archArea = item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
+
           return {
             ...item,
+            archArea:archArea,
             bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N",
             bdstUsgCd: item.reuseBuilding[0]?.bdstUsgCd,
           };
@@ -168,7 +173,8 @@ export default function Home() {
             setBdstChgProps({ ...bdstChgProps, isOpen: open });
           }}
         />
-      </ContentsDiv>
+        <Toaster position="top-center" />
+        </ContentsDiv>
     </>
   );
 }
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 63d2d1d03..c6683accb 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -205,7 +205,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       year: string,
       sggCd: string
     ) => {
-      set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
+    //  set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
         const rainChkRes = await initFetch(pageNo, cnt, year, sggCd);
         set((state: rainChkgdnState) => ({
@@ -214,17 +214,17 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
             ...state.rainChkgdn,
             rainChk: rainChkRes.data,
             rainChkCount: rainChkRes.count,
-            isInit: true, // 무한 루프 방지를 위해 isInit을 true로 설정
+            isInit: false, // 무한 루프 방지를 위해 isInit을 true로 설정
           },
         }));
       } catch (error) {
         console.log(error);
         // 에러가 발생하더라도 무한 루프에 빠지지 않도록 isInit을 true로 설정합니다.
-        set((state: rainChkgdnType) => ({
-          rainChkgdn: { ...state.rainChkgdn, isInit: true },
-        }));
+        // set((state: rainChkgdnType) => ({
+        //   rainChkgdn: { ...state.rainChkgdn, isInit: true },
+        // }));
       } finally {
-        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
+   //     set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
       }
     },
     rainChkNmSearch: async (
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index d40c1190c..6edee720b 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -183,7 +183,6 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
       year: string,
       sggCd: string
     ) => {
-      set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
       try {
         const rswtChkRes = await initFetch(pageNo, cnt, year, sggCd);
 
@@ -198,11 +197,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         }));
       } catch (error) {
         console.log(error);
-        set((state: rswtChkgdnType) => ({
-          rswtChkgdn: { ...state.rswtChkgdn, isInit: true },
-        }));
       } finally {
-        set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
       }
     },
     rswtChkNmSearch: async (
@@ -230,7 +225,6 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             ...state.rswtChkgdn,
             rswtChkRes: rswtChkRes.data,
             rswtChkCount: rswtChkRes.count,
-            isInit: false,
           },
         }));
       } catch (error) {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
index f2875e232..4e764d7ae 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
@@ -76,8 +76,7 @@ export const hdtflZod = z.object({
     .date()
     .default(() => new Date())
     .nullish(),
-  archArea: z.number().default(0),
-  archChgArea: z.number().nullish().default(0),
+  archArea: z.string().default(''),
   rgtr: z.string().nullish().default(null),
   mdfr: z.string().nullish().default(null),
   reuseBuilding: z
@@ -99,7 +98,8 @@ export type htdflFacState = {
   };
 };
 type htdflFacSActions = {
-  initHtdfl: (code: string) => void;
+  initHtdflReg: (code: string) => void;
+  htdflNmSearch: (code: string, fcltNm:string) => void;
   htdflBdstUpdate: (data: customHtdflBdst, code: string | number) => void;
   htdflBdstReg: (data: customHtdflBdst, code: string | number) => void;
   getHtdflBdstData: (pageNation: number, code: string | number) => void;
@@ -142,9 +142,11 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         console.log(e);
       }
     },
-    initHtdfl: async (code: string) => {
+    initHtdflReg: async (code: string) => {
       try {
         const htdflRes = await initFetch(code);
+
+        console.log('htdflRes ', htdflRes)
         set((state: htdflFacState) => {
           return {
             ...state,
@@ -162,10 +164,8 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
     htdflBdstUpdate: async (data: customHtdflBdst, code: string | number) => {
       try {
 
-        console.log('data ', data)
 
         const chData = await makeMdfr(data);
-        console.log('chData ', chData)
 
         const res = await putFectch("/drain/facility", chData);
         if (res.ok) {
@@ -208,6 +208,22 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         toast.error("온배수 건축물 등록 오류입니다..");
 
       }
-    }
+    },htdflNmSearch :async(code:string | number, fcltNm:string) =>{
+      try {
+        const htdflRes = await getFetch("wr", `/drain/facilityList/1/20/${code}/${fcltNm}`);
+        set((state: htdflFacState) => {
+          return {
+            ...state,
+            htdfl: {
+              ...state.htdfl,
+              htdflRes: htdflRes,
+              isInit: false,
+            },
+          };
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    },
   };
 };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
index d4cfebfca..6ceb75531 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
@@ -34,7 +34,7 @@ export const rainZod = z.object({
   bdstNm: z.string().default(""),
   frstArchPrmsnDt: z.date().default(() => new Date()),
   archChgPrmsnDt: z.coerce.date().nullish().default(null),
-  archArea: z.number().default(0),
+  archArea: z.string().default(''),
   archChgArea: z.number().default(0),
   rgtr:z.string().nullish(),
   mdfr:z.string().nullish(),
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
index 2d17b4601..32fea3ebb 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/type.tsx
@@ -25,9 +25,9 @@ export const baseReuseBuildingSchema = z.object({
     {
       message: validationMessages.yearFormat,
     }
-  ),
-  grntchBdstCertNo: z.string().default(""),
-  grntchBdstCertGrd: z.string().default(""),
+  ).nullish(),
+  grntchBdstCertNo: z.string().default("").nullish(),
+  grntchBdstCertGrd: z.string().default("").nullish(),
   crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
   crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
   crgRdctAmt: z.number().default(0), // 안쓰는 값
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
index 178badd3b..165a65021 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
@@ -5,11 +5,12 @@ import type { TableUpperProps } from "@/app/store/common/type/header";
 import { z } from "zod";
 import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "../rainReg/type";
 import { makeMdfr, makeRstr } from "../bdstReg";
+import toast from "react-hot-toast";
 
  const rswtrObjSchema = z.object({
   bdstRuseFcltFk: z.number().nullish(),
-  wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
-  oblgTrgtWtrUsqty: z.number().nullish().default(0),
+ // wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
+  //oblgTrgtWtrUsqty: z.number().nullish().default(0),
   orgwtKndCd: z.string({ required_error: validationMessages.requiredSelect("원수 종류") }).min(1, { message: validationMessages.requiredSelect("원수 종류") }),
   filtrTrtmfctCpct: z.number({ required_error: validationMessages.required("처리시설 용량") }).positive({ message: validationMessages.required("처리시설 용량") }),
   filtrTrtmfctProcs: z.string({ required_error: validationMessages.required("주요처리공정") }).min(1, { message: validationMessages.required("주요처리공정") }),
@@ -36,8 +37,7 @@ export const rswtZod = z.object({
   frstArchPrmsnDt: z.date().default(() => new Date()),
   archChgPrmsnDt: z.coerce.date().nullish().default(null),
   chBuildingYn: z.string().nullish(),
-  archArea: z.number().default(0),
-  archChgArea: z.number().default(0),
+  archArea: z.string().default(''),
   rgtr: z.string().nullish().default(null),
   mdfr: z.string().nullish().default(null),
   bdstUsgText: z.string().default(""),
@@ -152,8 +152,8 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
       try {
         const chData = await makeMdfr(data);
         const res = await putFectch("/reuseFc/waterreuseFc", chData);
-        if (res.ok) {
-          alert("등록이 완료되었습니다.");
+        if (res.status === 200) {
+          toast.success("중수도 시설 수정이 완료되었습니다.");
           const rswtRes = await initFetch(code);
           set((state: rswtFacState) => ({
             ...state,
@@ -165,10 +165,8 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
           }));
         }
       } catch (errorUpdate) {
-        alert(
-          "업데이트 오류입니다. " +
-            (errorUpdate instanceof Error ? errorUpdate.message : "")
-        );
+        toast.error("중수도 시설 수정 오류입니다.");
+
       } finally {
       }
     },
@@ -193,11 +191,11 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
               })
               .then((chch: any) => {
                 if (chch.ok) {
-                  alert("등록이 완료되었습니다.");
+                  toast.success("중수도 시설이 등록이  되었습니다.");
                 }
               });
           } else {
-            alert("등록이 완료되었습니다.");
+            toast.success("중수도 시설이 등록이  되었습니다.");
           }
         }
         const rainRes = await initFetch(code);
@@ -211,7 +209,7 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
         }));
       } catch (e) {
         console.log("e", e);
-        alert("등록 오류입니다.");
+        toast.success("중수도 시설이 등록 오류입니다.");
       } finally {
       }
     },
diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
index 8ae9ad4dd..04b36cbc5 100644
--- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
+++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
@@ -89,7 +89,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
 
   return (
     <>
-      <h1 className={formH1Class}>건축물 기본 정보</h1>
+      <h1 className={formH1Class}> {  type !== "HTB"?"건축물 기본 정보": '발전소 기본 정보'}</h1>
       <div className="grid grid-cols-6 gap-2 mt-4">
         <div className="col-span-3">
           <FormField
@@ -140,10 +140,10 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="bdstNm"
             render={({ field }) => (
-              <FormUi label="건축물명">
+              <FormUi label={  type !== "HTB"?"건축물명": '발전소명'}>
                 <Input
                   className={selectClass}
-                  placeholder="건축물 명 입력하세요"
+                  placeholder= {type !== "HTB"?"건축물 명 입력하세요":'발전소명 입력하세요' }
                   type="text"
                   {...field}
                 />
@@ -156,7 +156,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="daddr"
             render={({ field }) => (
-              <FormUi label="건축물 주소">
+              <FormUi label= {  type !== "HTB"?"건축물 주소": '발전소 주소'} >
                 <Input
                   className={selectClass}
                   placeholder="위치를 입력해주세요"
@@ -173,7 +173,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="frstArchPrmsnDt"
             render={({ field }) => (
-              <FormUi label="최초건축허가일">
+              <FormUi label= {  type !== "HTB"?"최초건축허가일": '준공년도'} >
                 <DatePicker
                   mode={"single"}
                   field={{
diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
index 7333f6091..0bf7cf786 100644
--- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
@@ -54,6 +54,7 @@ export default function RainRegForm({
       raw?.reuseBuilding && raw.reuseBuilding.length > 0
         ? raw.reuseBuilding
         : [{}];
+  
     return {
       ...raw,
       frstArchPrmsnDt: raw?.frstArchPrmsnDt
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
index ed0e51af6..587cde3fb 100644
--- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
@@ -59,10 +59,16 @@ export default function RswtrRegForm({
       rswtBdstReg(values, "41");
       if (setIsModal) setIsModal(false);
     } else {
+
+      
       rswtBdstUpdate(values, "41");
     }
   };
-  const cleanRswtData = (raw: any): z.infer<typeof rswtZod> => {
+
+  const filtrTrtmfctCpct = form.watch('reuseBuilding.0.filtrTrtmfctCpct')
+   const cleanRswtData = (raw: any): z.infer<typeof rswtZod> => {
+
+    console.log('raw ', raw)
     return {
       ...raw,
       frstArchPrmsnDt: raw?.frstArchPrmsnDt
@@ -82,11 +88,17 @@ export default function RswtrRegForm({
         rswtrObj: {
           ...item?.rswtrObj,
           filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
+          filtrTrtmfctCpct:item.rswtrObj.filtrTrtmfctCpct || 0,
+          filtrTrtmfctProcs:item.rswtrObj.filtrTrtmfctProcs||code.rswtPrscCdMthdCd[0]?.val,
+          orgwtKndCd:item?.rswtrObj.orgwtKndCd || code.orgwtKndCd[0]?.val ,
         },
       })),
     };
   };
 
+  useEffect(() =>{
+    console.log(' formform ', form.watch())
+  },[form.formState])
   useEffect(() => {
     console.log("form errors:", form.formState.errors);
   }, [form.formState.errors]);
@@ -253,7 +265,7 @@ export default function RswtrRegForm({
                       selectClass={selectClass}
                       selectArray={code.orgwtKndCd}
                       onSelectValue={readonly ? () => {} : field.onChange}
-                      value={field.value ?? code.orgwtKndCd[0]?.val}
+                      value={field.value || code.orgwtKndCd[0]?.val}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -272,7 +284,7 @@ export default function RswtrRegForm({
                       label={""}
                       selectArray={code.rswtPrscCdMthdCd}
                       onSelectValue={readonly ? () => {} : field.onChange}
-                      value={field.value ?? code.rswtPrscCdMthdCd[0]?.val}
+                      value={field.value || code.rswtPrscCdMthdCd[0]?.val}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -433,9 +445,6 @@ export default function RswtrRegForm({
                         }
                       }}
                       disabled={grntchBdstCertYn !== "Y"}
-                
-
-
                     />
                   </FormUi>
                 )}}

From e579684b28a93d5451ccc3282e0ed0de91686ba4 Mon Sep 17 00:00:00 2001
From: yschoi <yschoi>
Date: Fri, 4 Jul 2025 14:00:20 +0900
Subject: [PATCH 24/44] =?UTF-8?q?=EC=9E=AC=EC=9D=B4=EC=9A=A9=EC=8B=9C?=
 =?UTF-8?q?=EC=84=A4=20=EC=A7=80=EB=8F=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                         |  2 +-
 apps/wr/.env.development                           | 12 ++++++++++++
 apps/wr/.env.local                                 | 14 ++++++++++++++
 apps/wr/.gitignore                                 |  2 +-
 apps/wr/app/map/service/map.ts                     |  4 ++--
 packages/common/business_components/package.json   |  1 +
 .../common/business_components/src/ui/map/Gis.js   |  2 ++
 7 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 apps/wr/.env.development
 create mode 100644 apps/wr/.env.local

diff --git a/.gitignore b/.gitignore
index d0bb49da9..6b685ea40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,5 @@ apps/wr/.next/**/*
 apps/fo/.next/**/*
 
 # env
-.env*
+#.env*
 .qodo
diff --git a/apps/wr/.env.development b/apps/wr/.env.development
new file mode 100644
index 000000000..dccfb1453
--- /dev/null
+++ b/apps/wr/.env.development
@@ -0,0 +1,12 @@
+NEXT_PUBLIC_SITE_ID = WR
+NEXT_PUBLIC_PORT = 11301
+NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11301
+NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
+NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 
+NEXT_PUBLIC_CLAIM_NAME = Authorization
+NEXT_PUBLIC_AUTH_USER_ID = token-id
+NEXT_PUBLIC_ACCESS_TOKEN = access-token
+NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
+
+NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API
diff --git a/apps/wr/.env.local b/apps/wr/.env.local
new file mode 100644
index 000000000..858181f32
--- /dev/null
+++ b/apps/wr/.env.local
@@ -0,0 +1,14 @@
+NEXT_PUBLIC_SITE_ID = WR
+NEXT_PUBLIC_PORT = 3001
+NEXT_PUBLIC_PROXY_HOST = http://localhost:3001
+NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
+NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 
+NEXT_PUBLIC_CLAIM_NAME = Authorization
+NEXT_PUBLIC_AUTH_USER_ID = token-id
+NEXT_PUBLIC_ACCESS_TOKEN = access-token
+NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
+
+NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API
+#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api          # 최용성 
+#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api          # 박이정
diff --git a/apps/wr/.gitignore b/apps/wr/.gitignore
index 5ef6a5207..8c5b2ee3a 100644
--- a/apps/wr/.gitignore
+++ b/apps/wr/.gitignore
@@ -31,7 +31,7 @@ yarn-error.log*
 .pnpm-debug.log*
 
 # env files (can opt-in for committing if needed)
-.env*
+#.env*
 
 # vercel
 .vercel
diff --git a/apps/wr/app/map/service/map.ts b/apps/wr/app/map/service/map.ts
index bf0c8a694..5002afef7 100644
--- a/apps/wr/app/map/service/map.ts
+++ b/apps/wr/app/map/service/map.ts
@@ -2,8 +2,8 @@
 /**
  * 관망도 API
  */
-// const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}/v1/map`
-const API_URL = "http://con.mind-one.co.kr:11083/sewerage-service/api/v1/map";
+ const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}/v1/map`
+//const API_URL = "http://con.mind-one.co.kr:11083/sewerage-service/api/v1/map";
 
 export type LyrStngProps = {
   lyr_sn: string
diff --git a/packages/common/business_components/package.json b/packages/common/business_components/package.json
index da6f8c344..2c0b6ea47 100644
--- a/packages/common/business_components/package.json
+++ b/packages/common/business_components/package.json
@@ -44,6 +44,7 @@
     "recharts": "^2.15.1",
     "sonner": "^2.0.1",
     "tailwind-merge": "^3.0.1",
+    "tailwindcss-animate": "^1.0.7",
     "xlsx": "^0.18.5",
     "xlsx-populate": "^1.21.0",
     "zod": "^3.24.2"
diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index 6d46e77aa..6e13d70c5 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -209,11 +209,13 @@ function Gis({ isOpen, gisMaps, isSearchModalOpen, treeData = [], isSearch = fal
 							onClose={closePopup} // 닫기 콜백 전달
 						/>
 					)}
+					{SearchView &&(
 					<SearchView
 						open={isSearchModalOpen}
 						onOpenChange={setIsSearchModalOpen}
 						onFeatureSelect={onFeatureSelect}
 					/>
+					)}
 					<GisLonLat />
 					<GisToolBar />
 					<GisMapToggle />

From ea0c85b0c3d7fcf99ddca71da3fdb60910eaefe5 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Fri, 4 Jul 2025 14:30:02 +0900
Subject: [PATCH 25/44] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=A0=90=EA=B2=80?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=ED=98=84=ED=99=A9=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=8B=9C=EC=84=A4=EB=AA=85=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  |  7 ++--
 .../prfmncSttn/chkgdnSttn/page.tsx            | 41 +++++++++++++++++--
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx |  3 +-
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       | 28 ++++++++++---
 .../chkgdnSttn/rswtChkgdnSttn/index.tsx       | 22 ++++++++--
 5 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index 328bb8b88..c5f7b198a 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -83,7 +83,7 @@ export default function Page() {
     String(new Date().getFullYear())
   );
   const cellClick = () => {
-    if (searchYear)
+    if (searchYear) {
       if (selFcltDiv === "RNB") {
         if (fcltNm) {
           rainChkNmSearch(
@@ -99,8 +99,8 @@ export default function Page() {
       } else {
         if (fcltNm) {
           rswtChkNmSearch(
-            rainPageNation,
-            rainPageSize,
+            rswtPageNation,
+            rswtPageSize,
             searchYear,
             commonCd,
             fcltNm
@@ -109,6 +109,7 @@ export default function Page() {
           rswtChkgdnInit(rswtPageNation, rswtPageSize, searchYear, commonCd);
         }
       }
+    }
   };
   const rainPageChange = (pageNo: number) => {
     if (pageNo > 0) {
diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
index 60040833b..592a6826e 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
@@ -15,6 +15,7 @@ import {
   SearchDiv,
   SearchFormLeft,
   SearchFormRight,
+  SearchInput,
   SelectBox,
   Title,
   UiModal
@@ -30,9 +31,9 @@ export default function Page() {
     rainChkSttn,
     rswtChkSttn,
     rainChkSttnInit,
-    rainChkSttnSearch,
-    rswtChkSttnSearch,
+    rainChkSttnNmSearch,
     rswtChkSttnInit,
+    rswtChkNmSttnSearch,
     isRainSttn,
     isRswtSttn,
     rswtChkPolInit,
@@ -43,6 +44,7 @@ export default function Page() {
   const [selFcltDiv, setSelFcltDiv] = useState("RNB");
   const [rainPageNation, setRainPageNation] = useState(1);
   const [rswtPageNation, setRswtPageNation] = useState(1);
+  const [fcltNm, setFcltNm] = useState<string>("");
   const [isModal, setIsModal] = useState({
     open: false,
     data: {},
@@ -51,9 +53,29 @@ export default function Page() {
   const cellClick = () => {
     if (searchYear) {
       if (selFcltDiv === "RNB") {
-        rainChkSttnSearch(rainPageNation, rainPageSize, searchYear, commonCd);
+        if (fcltNm) {
+          rainChkSttnNmSearch(
+            rainPageNation,
+            rainPageSize,
+            searchYear,
+            commonCd,
+            fcltNm
+          );
+        } else {
+          rainChkSttnInit(rainPageNation, rainPageSize, searchYear, commonCd);
+        }
       } else {
-        rswtChkSttnSearch(rswtPageNation, rswtPageSize, searchYear, commonCd);
+        if (fcltNm) {
+          rswtChkNmSttnSearch(
+            rswtPageNation,
+            rswtPageSize,
+            searchYear,
+            commonCd,
+            fcltNm
+          );
+        } else {
+          rswtChkSttnInit(rswtPageNation, rswtPageSize, searchYear, commonCd);
+        }
       }
     }
   };
@@ -151,6 +173,17 @@ export default function Page() {
                   value={selFcltDiv ?? rainChkSttn.fcltDiv[0]?.val}
                 />
               </div>
+              <div className="col-span-2 flex flex-row space-x-2">
+                <Label className="w-28 mt-2 text-xl text-gray-600">
+                  {"시설명"}
+                </Label>
+                <SearchInput
+                  className={"w-full text-2xl"}
+                  label={""}
+                  textValue={fcltNm || ""}
+                  setText={setFcltNm}
+                />
+              </div>
             </SearchFormLeft>
             <SearchFormRight>
               <div className="space-y">
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index 6e0a805b6..235b4f3e2 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -217,12 +217,11 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           "wr",
           `/reuseChk/reuseWater` +
             (pageNo ? `/${pageNo}` : "/1") +
-            (cnt ? `/${cnt}` : "/20") +
+            (cnt ? `/${cnt}` : "/5") +
             (year ? `/${year}` : `/${currentYear}`) +
             (sggCd ? `/${sggCd}` : "/0") +
             (txt ? `/${txt}` : "")
         );
-
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index 895f096ef..43c3969e2 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -36,9 +36,9 @@ export type rainChkSttnState = {
 
 type rainChkSttnActions = {
   rainChkSttnInit: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
-  rainChkSttnSearch: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
   isRainSttn: (isSttn: boolean) => void;
   getRainSttnExcel: (excelList: rainChkZodType[]) => void;
+  rainChkSttnNmSearch: (pageNo: number, cnt: number, year: string, sggCd: string, txt: string) => void
 };
 
 export type rainChkSttnType = rainChkSttnState & rainChkSttnActions;
@@ -91,21 +91,37 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
         console.log(error);
       }
     },
-    rainChkSttnSearch: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
+    rainChkSttnNmSearch: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string,
+      txt: string
+    ) => {
       try {
-        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
-
+        const currentYear = new Date().getFullYear();
+        const rainChkRes = await getCountFetch(
+          "wr",
+          `/reuseChk/rainy` +
+          (pageNo ? `/${pageNo}` : "/1") +
+          (cnt ? `/${cnt}` : "/5") +
+          (year ? `/${year}` : `/${currentYear}`) +
+          (sggCd ? `/${sggCd}` : "/0") +
+          (txt ? `/${txt}` : "")
+        );
         return set((state: rainChkSttnState) => ({
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            rainChkRes: rainChkRes
+            rainChkRes: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
           },
         }));
       } catch (error) {
         console.log(error);
       }
-    }, isRainSttn: (isSttn: boolean) => {
+    },
+    isRainSttn: (isSttn: boolean) => {
       try {
         return set((state: rainChkSttnState) => ({
           ...state,
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
index 519cd39b2..f1d7a7d19 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
@@ -28,7 +28,7 @@ type rswtChkSttnActions = {
   rswtChkSttnInit: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
   isRswtSttn: (isSttn: boolean) => void;
   getRswtSttnExcel: (excelList: rswtChkZodType[]) => void;
-  rswtChkSttnSearch: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
+  rswtChkNmSttnSearch: (pageNo: number, cnt: number, year: string, sggCd: string, txt: string) => void;
 };
 
 export type rswtChkSttnType = rswtChkSttnState & rswtChkSttnActions;
@@ -109,9 +109,24 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
         console.log(error);
       }
     },
-    rswtChkSttnSearch: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
+    rswtChkNmSttnSearch: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string,
+      txt: string
+    ) => {
       try {
-        const rswtChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
+        const currentYear = new Date().getFullYear().toString();
+        const rswtChkRes = await getCountFetch(
+          "wr",
+          `/reuseChk/reuseWater` +
+          (pageNo ? `/${pageNo}` : "/1") +
+          (cnt ? `/${cnt}` : "/20") +
+          (year ? `/${year}` : `/${currentYear}`) +
+          (sggCd ? `/${sggCd}` : "/0") +
+          (txt ? `/${txt}` : "")
+        );
 
         return set((state: rswtChkSttnState) => ({
           ...state,
@@ -119,6 +134,7 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
             ...state.rswtChkSttn,
             rswtChkRes: rswtChkRes.data,
             rswtChkCount: rswtChkRes.count,
+            isInit: false,
           },
         }));
       } catch (error) {

From 7bbab96c4be6404ef868c85c60b7b94ccd5cb506 Mon Sep 17 00:00:00 2001
From: YangJinSoo94 <jschrome782@gmail.com>
Date: Fri, 4 Jul 2025 15:12:51 +0900
Subject: [PATCH 26/44] =?UTF-8?q?=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=82=AC=EB=A1=80=EA=B4=80=EB=A6=AC=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5(=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80)=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx | 16 ++++++++-----
 .../wr/app/store/matDmd/ruseCaseMng/index.tsx | 23 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx b/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
index 517dab0c0..a81a85e19 100644
--- a/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
+++ b/apps/wr/app/matMng/coMat/ruseCaseMng/page.tsx
@@ -26,7 +26,7 @@ import { toast, Toaster } from "react-hot-toast";
 
 export default function RuseCaseMng() {
     const { code, ruseCaseMng, selectRuseCaseMng } = useWrStore((state) => state);
-    const { ruseCaseMngList, status } = ruseCaseMng;
+    const { ruseCaseMngList, status, count } = ruseCaseMng;
     const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>([]);
     const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
     
@@ -36,8 +36,10 @@ export default function RuseCaseMng() {
     const [name, setName] = useState<string>("");
 
     // 물재이용사례 조회
-    const searchRuseCaseMng = async () => {
+    const searchRuseCaseMng = async (pageNo: number, pageSize: number) => {
         const res = await selectRuseCaseMng(
+            pageNo,
+            pageSize,
             sidoCd ?? "", 
             sigunguCd ?? "", 
             selectUtz[0] ?? "",
@@ -70,7 +72,7 @@ export default function RuseCaseMng() {
 
     // 다운로드
     const download = () => {
-        searchRuseCaseMng();
+        searchRuseCaseMng(1, 10000);;
         
         fetch(`/sample_ruseCaseMng.xlsx`, {}).then(async (response) => {
           if (!response.ok) {
@@ -210,7 +212,7 @@ export default function RuseCaseMng() {
                             <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2">
                                 <div className="space-y">
                                     <div className="flex flex-row space-x-2">
-                                        <Button size={"sm"} onClick={() => { searchRuseCaseMng() }}>
+                                        <Button size={"sm"} onClick={() => { searchRuseCaseMng(1, 20) }}>
                                             조회
                                         </Button>
                                         <Button size={"sm"} onClick={() => { setIsExcelOpen({ isModal: true }); }}>
@@ -238,9 +240,11 @@ export default function RuseCaseMng() {
                                     children={undefined}
                                     headlist={ruseCaseMng.ruseHeadList}
                                     pageSize={20}
-                                    total={100000}
+                                    total={count}
                                     cellClick={(index: number | undefined, headId: string) => {}}
-                                    onPageChange={() => {}}
+                                    onPageChange={(pageNo: number) => {
+                                        searchRuseCaseMng(pageNo, 10);
+                                    }}
                                 />
                             </div>
                         </ListDiv>
diff --git a/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx b/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
index 76468d249..5a2ad235e 100644
--- a/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
+++ b/apps/wr/app/store/matDmd/ruseCaseMng/index.tsx
@@ -1,4 +1,4 @@
-import { fetchType, getFetch, postFectch } from "@/components/lib/api";
+import { fetchType, getFetch, getFetchWithCount, postFectch } from "@/components/lib/api";
 import type { TableUpperProps } from "../../common/type/header";
 import { ruseCaseHeadListExport } from "./headList";
 import { toast } from "react-hot-toast";
@@ -7,6 +7,7 @@ export type ruseCaseState = {
     ruseHeadList:TableUpperProps[];
     ruseCaseMngList:ruseCaseMngExcelProps[];
     status: number;
+    count: number;
   };
 };
 
@@ -64,14 +65,14 @@ export interface ruseCaseMngExcelProps {
 }
 
 type ruseCaseActions = {
-  selectRuseCaseMng: (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => Promise<void>;
+  selectRuseCaseMng: (pageNo: number, pageSize: number, sidoCd: string, sigunguCd: string, usageCd : string, name: string) => Promise<void>;
   insertRuseCaseMng: (data: any) => Promise<void>;
 };
 
-export const fetchSearchRuseCaseMng = async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
-  const tailUrl = ((sigunguCd !== '전체' && sigunguCd !=='') ? `/${sigunguCd}` :  (sidoCd != '전체' && sidoCd != '') ? `/${sidoCd}` : `/0`) + (usageCd? `/${usageCd}` : '/0') + (name? `/${name}` : '');
-  const resp = await getFetch(fetchType.WR,`/reuseFc/pubFcRuseCase${tailUrl}`);
-  return resp;
+export const fetchSearchRuseCaseMng = async (pageNo: number, pageSize: number, sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
+  const tailUrl = '/'+pageNo+'/'+pageSize+ ((sigunguCd !== '전체' && sigunguCd !=='') ? `/${sigunguCd}` :  (sidoCd != '전체' && sidoCd != '') ? `/${sidoCd}` : `/0`) + (usageCd? `/${usageCd}` : '/0') + (name? `/${name}` : '');
+  const resp = await getFetchWithCount(fetchType.WR,`/reuseFc/pubFcRuseCase${tailUrl}`);
+  return {data:resp.data, count:resp.count};
 };
 
 export const fetchInsertRuseCaseMng = async (data: any) => {
@@ -86,6 +87,7 @@ export const ruseCaseStateExport: ruseCaseState = {
     ruseHeadList:ruseCaseHeadListExport,
     ruseCaseMngList:[],
     status: 0,
+    count: 0,
   },
 };
 
@@ -93,12 +95,13 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
   set: any
 ) => {
   return {
-    selectRuseCaseMng: async (sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
-      const res = await fetchSearchRuseCaseMng(sidoCd, sigunguCd, usageCd, name);
+    selectRuseCaseMng: async (pageNo: number, pageSize: number, sidoCd: string, sigunguCd: string, usageCd : string, name: string) => {
+      const res = await fetchSearchRuseCaseMng(pageNo, pageSize, sidoCd, sigunguCd, usageCd, name);
       set((state: ruseCaseState) => ({
         ruseCaseMng: {
           ...state.ruseCaseMng,
-          ruseCaseMngList: res,
+          ruseCaseMngList: res.data,
+          count: res.count,
         },
       }));
     },
@@ -118,4 +121,4 @@ export const ruseCaseActionsExport: (set: any) => ruseCaseActions = (
       }));
     },
   };
-};
+};
\ No newline at end of file

From cec35e67241df033c783397ac1c7321bb255e22a Mon Sep 17 00:00:00 2001
From: truthwing <truthplumage@gmail.com>
Date: Fri, 4 Jul 2025 15:40:13 +0900
Subject: [PATCH 27/44] jyha product

---
 .../ruseFcltMng/prfmncReg/chkgdnReg/page.tsx  | 159 +++++++++++++----
 .../prfmncSttn/chkgdnSttn/page.tsx            |  27 ++-
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  | 163 ++++++++++++++----
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx | 151 ++++++++++------
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       |  40 +++--
 .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx  |  27 +--
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   |  29 ++--
 .../chkgdTable/rswtChkgd/rswtChkgdTable.tsx   |  21 ++-
 8 files changed, 439 insertions(+), 178 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
index d03ae70fe..0ac9145a5 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx
@@ -1,10 +1,14 @@
 "use client";
 
 import { useWrStore } from "@/app/store";
-import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import type {
-  rswtChkZodType,
-  rswtrChkDetailsZodType,
+import {
+  commonCd,
+  rainPageSize,
+  type rainChkZodType,
+} from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import {
+  rswtPageSize,
+  type rswtrChkDetailsZodType,
 } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import {
   excelArrayDownload,
@@ -15,6 +19,7 @@ import ChkgdExcel from "@/components/ui/modal/chkgd/chkgdExcel/chkgdExcel";
 import ChkgdModal from "@/components/ui/modal/chkgd/chkgdModal/chkgdModal";
 import RainChkgdTable from "@/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable";
 import RswtChkgdTable from "@/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable";
+import { SearchInput } from "@common/business_components";
 import {
   ContentsDiv,
   SearchDiv,
@@ -26,8 +31,14 @@ import {
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button, Label } from "@common/components/ui";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@common/components/ui/tooltip";
 import { useCallback, useEffect, useState } from "react";
-import { Toaster } from "react-hot-toast";
+import toast, { Toaster } from "react-hot-toast";
 
 export default function Page() {
   const {
@@ -39,8 +50,10 @@ export default function Page() {
     rainChkDelete,
     rainChkExcelDownload,
     rainChkHeadChange,
+    rainChkNmSearch,
     isRainSttn,
     rswtChkgdnInit,
+    rswtChkNmSearch,
     rswtChkPolInit,
     rswtChkDetilsUpdate,
     rswtChkDelete,
@@ -57,21 +70,36 @@ export default function Page() {
     rswtrChkDetailsZodType[]
   >([]);
   const [deleteIdx, setDeleteIdx] = useState<number[]>([]);
-  const [pageNation, setPageNation] = useState(1);
+  const [rainPageNation, setRainPageNation] = useState(1);
+  const [rswtPageNation, setRswtPageNation] = useState(1);
+  const [fcltNm, setFcltNm] = useState<string>("");
   const [selFcltDiv, setSelFcltDiv] = useState("RNB");
   const [isModal, setIsModal] = useState({
     open: false,
     data: {},
   });
+  const [searchYear, setSearchYear] = useState<string>(
+    String(new Date().getFullYear())
+  );
   const cellClick = () => {
-    if (searchYear) {
+    if (searchYear)
       if (selFcltDiv === "RNB") {
-        rainChkInit("1", "20", searchYear, "0");
+        if (fcltNm) {
+          rainChkNmSearch(
+            rainPageNation,
+            rainPageSize,
+            searchYear,
+            commonCd,
+            fcltNm
+          );
+        } else {
+          rainChkInit(rainPageNation, rainPageSize, searchYear, commonCd);
+        }
       } else {
         if (fcltNm) {
           rswtChkNmSearch(
-            rswtPageNation,
-            rswtPageSize,
+            rainPageNation,
+            rainPageSize,
             searchYear,
             commonCd,
             fcltNm
@@ -80,27 +108,46 @@ export default function Page() {
           rswtChkgdnInit(rswtPageNation, rswtPageSize, searchYear, commonCd);
         }
       }
+  };
+  const rainPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRainPageNation(pageNo);
+      rainChkInit(pageNo, rainPageSize, searchYear, commonCd);
+    }
+  };
+  const rswtPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRswtPageNation(pageNo);
+      rswtChkgdnInit(pageNo, rswtPageSize, searchYear, commonCd);
     }
   };
 
-  const [searchYear, setSearchYear] = useState<string>(
-    String(new Date().getFullYear())
-  );
-
   useEffect(() => {
     if (!rainChkgdn.isInit) {
-      rainChkInit("1", "20", new Date().getFullYear().toString(), "0");
+      rainChkInit(
+        1,
+        rainPageSize,
+        new Date().getFullYear().toString(),
+        commonCd
+      );
       isRainSttn(false);
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
+  }, [rainChkgdn.isInit, rainChkInit, rainPageSize]);
 
+  useEffect(() => {
     if (!rswtChkgdn.isInit) {
-      rswtChkgdnInit("1", "20", new Date().getFullYear().toString(), "0");
+      rswtChkgdnInit(
+        1,
+        rswtPageSize,
+        new Date().getFullYear().toString(),
+        commonCd
+      );
       setIsModal({ data: {}, open: false });
       setIsRegExcel(false);
     }
-  }, [rainChkgdn.isInit, rainChkInit]);
+  }, [rswtChkgdn.isInit, rswtChkgdnInit, rswtPageSize]);
 
   useEffect(() => {
     if (rswtChkgdn.excelList[0] && rswtChkgdn.excelList[0]?.data.length > 1) {
@@ -144,8 +191,8 @@ export default function Page() {
   );
 
   useEffect(() => {
-    //rainChkgdn.isSttn = false;
-    //rswtChkgdn.isSttn = false;
+    rainChkgdn.isSttn = false;
+    rswtChkgdn.isSttn = false;
     if (!rainChkgdn.isSttn && !rswtChkgdn.isSttn) {
       rainChkHeadChange({ rainChkgdn }, true);
       rswtChkHeadChange({ rswtChkgdn }, true);
@@ -163,9 +210,17 @@ export default function Page() {
   };
   const chkUpdateTable = (selFcltDiv: string) => {
     if (selFcltDiv === "RNB") {
+      if (updateRainDetail && updateRainDetail.length > 0) {
       rainChkDetilUpdate(updateRainDetail);
     } else {
+        toast.error("수정을 원하는 행을 선택하고 저장버튼을 눌러주세요 ");
+      }
+    } else {
+      if (updateRswtDetail && updateRswtDetail.length > 0) {
       rswtChkDetilsUpdate(updateRswtDetail);
+      } else {
+        toast.error("수정을 원하는 행을 선택하고 저장버튼을 눌러주세요 ");
+      }
     }
   };
 
@@ -187,10 +242,8 @@ export default function Page() {
                   selectArray={yearOptions}
                   value={searchYear}
                   onSelectValue={(val: string | number) => {
-                    setSearchYear(String(val))
-                  }
-
-                  }
+                    setSearchYear(String(val));
+                  }}
                 />
               </div>
               <div className="col-span-2 flex flex-row space-x-2">
@@ -204,12 +257,22 @@ export default function Page() {
                   selectArray={rainChkgdn.fcltDiv}
                   onSelectValue={(val: string | number) => {
                     if (val === "RST") rswtChkPolInit();
-                    setSelFcltDiv(String(val))
-                  }
-                  }
+                    setSelFcltDiv(String(val));
+                  }}
                   value={selFcltDiv ?? rainChkgdn.fcltDiv[0]?.val}
                 />
               </div>
+              <div className="col-span-2 flex flex-row space-x-2">
+                <Label className="w-28 mt-2 text-xl text-gray-600">
+                  {"시설명"}
+                </Label>
+                <SearchInput
+                  className={"w-full h-full text-2xl"}
+                  label={""}
+                  textValue={fcltNm || ""}
+                  setText={setFcltNm}
+                />
+              </div>
             </SearchFormLeft>
             <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
               <div className="space-y">
@@ -230,6 +293,10 @@ export default function Page() {
                   >
                     삭제
                   </Button>
+
+                  <TooltipProvider>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
                   <Button
                     size={"sm"}
                     onClick={() => {
@@ -238,6 +305,16 @@ export default function Page() {
                   >
                     저장
                   </Button>
+                      </TooltipTrigger>
+                      <TooltipContent side="bottom" sideOffset={5}>
+                        <h2 className="text-xl">
+                          아래 테이블에 선택을 체크하면 입력셀이 활성화 됩니다.
+                        </h2>
+                      </TooltipContent>
+                    </Tooltip>
+                  </TooltipProvider>
+
+
                   <Button
                     size={"sm"}
                     onClick={() => {
@@ -264,17 +341,18 @@ export default function Page() {
                 detailUp={setUpdateRainDetail}
                 handleClick={handleClick}
                 rainChkData={rainChkgdn.rainChk}
-                pageNation={pageNation}
-                onPageChange={setPageNation}
-              />
+                pageNation={rainPageNation}
+                onPageChange={rainPageChange}
+                pageCount={rainChkgdn.rainChkCount} />
             ) : (
               <RswtChkgdTable
                 detaiRswtlUpdate={setUpdateRSwtDetail}
                 deleteRswtData={setDeleteIdx}
                 handleRswtClick={handleClick}
                 rswtChkData={rswtChkgdn.rswtChkRes}
-                pageNation={pageNation}
-                onPageChange={setPageNation}
+                pageNation={rswtPageNation}
+                onPageChange={rswtPageChange}
+                pageCount={rswtChkgdn.rswtChkCount}
               />
             )}
           </ListDiv>
@@ -282,17 +360,28 @@ export default function Page() {
       </div>
       <UiModal
         open={isModal.open}
-        onOpenChange={() => {
-          setIsModal({ open: !open, data: {} });
+        onOpenChange={(open: boolean) => {
+          setIsModal((prev) => ({ ...prev, open }));
         }}
         bodyClass={"w-[80vw] max-w-none"}
-        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} />}
+        body={
+          <ChkgdModal
+            type={selFcltDiv}
+            obj={isModal.data}
+            setIsModal={(open) => setIsModal((prev) => ({ ...prev, open }))}
+          />
+        }
       ></UiModal>
       <UiModal
         open={isRegExcel}
         onOpenChange={setIsRegExcel}
         bodyClass={"w-[30vw] max-w-none"}
-        body={<ChkgdExcel type={selFcltDiv}></ChkgdExcel>}
+        body={
+          <ChkgdExcel
+            type={selFcltDiv}
+            setIsRegExcel={setIsRegExcel}
+          ></ChkgdExcel>
+        }
       />
       <Toaster position="top-center" />
     </ContentsDiv>
diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
index a3dbd70b9..f8669bd2c 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 import { useWrStore } from "@/app/store";
+import { commonCd, rainPageSize } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import { rswtPageSize } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import {
   excelDownload,
   yearOptions
@@ -77,23 +79,36 @@ export default function Page() {
       }
     }
   };
+const rainPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRainPageNation(pageNo);
+      rainChkSttnInit(pageNo, rainPageSize, searchYear, commonCd);
+    }
+  };
+
+  const rswtPageChange = (pageNo: number) => {
+    if (pageNo > 0) {
+      setRswtPageNation(pageNo);
+      rswtChkSttnInit(pageNo, rswtPageSize, searchYear, commonCd);
+    }
+  };
 
   useEffect(() => {
     if (!rainChkSttn.isInit) {
       isRainSttn(true)
-      rainChkSttnInit(new Date().getFullYear().toString(), "0");
+      rainChkSttnInit(1, rainPageSize, new Date().getFullYear().toString(), commonCd);
       setIsModal({ data: {}, open: false });
     }
-  }, [rainChkSttn.isInit, rainChkSttnInit]);
+  }, [rainChkSttn.isInit, rainChkSttnInit, rainPageSize]);
 
   useEffect(() => {
-
     if (!rswtChkSttn.isInit) {
       setIsModal({ data: {}, open: false });
-      rswtChkSttnInit(new Date().getFullYear().toString(), "0");
+      rswtChkSttnInit(1, rswtPageSize, new Date().getFullYear().toString(), commonCd);
       isRswtSttn(true)
     }
-  }, [rswtChkSttn.isInit, rswtChkSttnInit])
+  }, [rswtChkSttn.isInit, rswtChkSttnInit, rswtPageSize])
+
 
 
   const handleClick = useCallback(
@@ -222,7 +237,7 @@ export default function Page() {
           setIsModal({ open: !open, data: {} });
         }}
         bodyClass={"w-[80vw] max-w-none"}
-        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} />}
+        body={<ChkgdModal type={selFcltDiv} obj={isModal.data} setIsModal={() => { }} />}
       ></UiModal>
       <Toaster position="top-center" />
     </ContentsDiv>
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 4c7f2d514..e256b4ef4 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -1,26 +1,31 @@
 import { buildingType } from "@/app/store/common/code";
+import type { TableUpperProps } from "@/app/store/common/type/header";
 import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   deleteFectch,
   fetchType,
+  getCountFetch,
   getFetch,
   postFectch,
   putFectch,
 } from "@/components/lib/api";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import type { SelectDataType } from "@common/business_components/ui";
+import toast from "react-hot-toast";
 import { z } from "zod";
 import { buildingToExcelType } from "./excel";
 import {
   rainChkgdnHeadListExport,
   rainChkZod,
-  rainHeadNmExport,
+  rainMainHeadNmExport,
+  rainRuseHeadNmExport,
+  rainSplHeadNmExport,
   ruseHeadListExport,
   splHeadListExport,
   type chHeadType,
 } from "./headList";
-import type { TableUpperProps } from "@/app/store/common/type/header";
-import toast from "react-hot-toast";
+
+export const rainPageSize = 5;
+export const commonCd = "41";
 
 export type rainChkZodType = z.infer<typeof rainChkZod>;
 const fcltDiv = [
@@ -28,16 +33,20 @@ const fcltDiv = [
   { val: "RNB", text: "빗물이용시설" },
 ];
 
-const rainHeadNm = rainHeadNmExport;
+const rainRuseHeadNm = rainRuseHeadNmExport;
+const rainSplHeadNm = rainSplHeadNmExport;
 const rainChkgdnHeadList = rainChkgdnHeadListExport;
 const ruseHeadList = ruseHeadListExport;
 const splHeadList = splHeadListExport;
+const rainMainHeadNm = rainMainHeadNmExport
 
 const rainChk: rainChkZodType[] = [];
 
 export type rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: TableUpperProps[];
+    rainSplHeadNm:chHeadType[]
+    rainRuseHeadNm:chHeadType[]
     rainChk: rainChkZodType[];
     rainHeadNm: chHeadType[];
     ruseHeadList: TableUpperProps[];
@@ -45,15 +54,18 @@ export type rainChkgdnState = {
     isInit: boolean;
     isModalClose: boolean;
     fcltDiv: SelectDataType[];
+    rainMainHeadNm:chHeadType[]
     excelList: [];
     isSttn: boolean;
+    rainChkCount: number;
+    isLoading: boolean;
   };
 };
 
 type rainChkgdnActions = {
   rainChkInit: (
-    pageNo: string,
-    cnt: string,
+    pageNo: number,
+    cnt: number,
     sggCd: string,
     searchTxt: string
   ) => void;
@@ -66,6 +78,13 @@ type rainChkgdnActions = {
   rainChkExcelDataUPload(excelData: rainChkZodType[]): Promise<void>;
   rainChkDelete(chkgdnPks: number[]): Promise<void>;
   rainChkHeadChange: (rainChkgdn: rainChkgdnState, isEdit: boolean) => void;
+  rainChkNmSearch: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string,
+    txt: string
+  ) => void;
 };
 
 export type rainChkgdnType = rainChkgdnState & rainChkgdnActions;
@@ -73,7 +92,9 @@ export type rainChkgdnType = rainChkgdnState & rainChkgdnActions;
 export const rainChkgdnStateExport: rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: rainChkgdnHeadList,
-    rainHeadNm: rainHeadNm,
+    rainRuseHeadNm: rainRuseHeadNm,
+    rainSplHeadNm:rainSplHeadNm,
+    rainMainHeadNm:rainMainHeadNm,
     rainChk: rainChk,
     splHeadList: splHeadList,
     ruseHeadList: ruseHeadList,
@@ -82,6 +103,8 @@ export const rainChkgdnStateExport: rainChkgdnState = {
     excelList: [],
     fcltDiv: fcltDiv,
     isSttn: false,
+    rainChkCount: 1,
+    isLoading: false,
   },
 };
 
@@ -103,20 +126,22 @@ const makeMdfrChk = (data: rainChkZodType[], type: string, toDo: string) => {
 };
 
 const initFetch = async (
-  pageNo: string,
-  cnt: string,
-  txt: string | undefined,
+  pageNo: number,
+  cnt: number,
+  year: string | undefined,
   sgg: string | undefined
 ) => {
   const currentYear = new Date().getFullYear().toString();
-  const rainRes = await getFetch(
+
+  const rainRes = await getCountFetch(
     "wr",
     `/reuseChk/rainy` +
       (pageNo ? `/${pageNo}` : "/1") +
-      (cnt ? `/${cnt}` : "/20") +
-      (txt ? `/${txt}` : `/${currentYear}`) +
+      (cnt ? `/${cnt}` : "/10") +
+      (year ? `/${year}` : `/${currentYear}`) +
       (sgg ? `/${sgg}` : "/0")
   );
+
   return rainRes;
 };
 
@@ -142,16 +167,24 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       }));
     },
     rainChkExcelDataUPload: async (excelData: rainChkZodType[]) => {
+      set((state: rainChkgdnType) => (
+        { rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
         const res = await postFectch("/reuseChk/rainy", excelData);
         if (res.status === 200) {
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "0");
-          return set((state: rainChkgdnState) => ({
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            commonCd
+          );
+          set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
           toast.success("지도점검 등록이 완료되었습니다.");
@@ -161,22 +194,62 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       } catch (error) {
         console.log(error);
         toast.error("지도점검 등록이 실패되었습니다.");
+      } finally {
+        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
       }
     },
     rainChkInit: async (
-      pageNo: string,
-      cnt: string,
-      searchTxt: string,
+      pageNo: number,
+      cnt: number,
+      year: string,
       sggCd: string
     ) => {
+      set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
-        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
-
+        const rainChkRes = await initFetch(pageNo, cnt, year, sggCd);
+        set((state: rainChkgdnState) => ({
+          ...state,
+          rainChkgdn: {
+            ...state.rainChkgdn,
+            rainChk: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
+            isInit: true, // 무한 루프 방지를 위해 isInit을 true로 설정
+          },
+        }));
+      } catch (error) {
+        console.log(error);
+        // 에러가 발생하더라도 무한 루프에 빠지지 않도록 isInit을 true로 설정합니다.
+        set((state: rainChkgdnType) => ({
+          rainChkgdn: { ...state.rainChkgdn, isInit: true },
+        }));
+      } finally {
+        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
+      }
+    },
+    rainChkNmSearch: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string,
+      txt: string
+    ) => {
+      try {
+        const currentYear = new Date().getFullYear();
+        const rainChkRes = await getCountFetch(
+          "wr",
+          `/reuseChk/rainy` +
+            (pageNo ? `/${pageNo}` : "/1") +
+            (cnt ? `/${cnt}` : "/10") +
+            (year ? `/${year}` : `/${currentYear}`) +
+            (sggCd ? `/${sggCd}` : "/0") +
+            (txt ? `/${txt}` : "")
+        );
         return set((state: rainChkgdnState) => ({
           ...state,
           rainChkgdn: {
             ...state.rainChkgdn,
-            rainChk: rainChkRes,
+            rainChk: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
           },
         }));
       } catch (error) {
@@ -187,26 +260,32 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       try {
         const chData = await makeMdfrChk(rainChk, "rain", "rainDetil");
 
-        const res = await postFectch("/reuseChk/rainy", chData);
-        if (res.staus === 200) {
+        const res = await putFectch("/reuseChk/rainy/list", chData);
+        if (res) {
           toast.success(
-            "지도점검 보급수 및 밋물이용량 수정이 완료되었습니다. "
+            "지도점검 대체수 및 밋물이용량 수정이 완료되었습니다. "
           );
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
         } else {
-          toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
+          toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
         }
       } catch (error) {
         console.log(error);
-        toast.error("지도점검 보급수 및 밋물이용량 수정 오류입니다.");
+        toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
       }
     },
     rainChkGuidUpdate: async (rainChk: rainChkZodType) => {
@@ -217,15 +296,21 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           toast.success("지도점검 수질 및 과태료 수정이 완료되었습니다. ");
 
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
-        }else{
+        } else {
           toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
 
         }
@@ -241,15 +326,21 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
           toast.success("삭제가 완료되었습니다. ");
 
           const currentYear = new Date().getFullYear().toString();
-          const rainChkRes = await initFetch("1", "20", currentYear, "11");
+          const rainChkRes = await initFetch(
+            1,
+            rainPageSize,
+            currentYear,
+            "41"
+          );
           return set((state: rainChkgdnState) => ({
             ...state,
             rainChkgdn: {
               ...state.rainChkgdn,
-              rainChk: rainChkRes,
+              rainChk: rainChkRes.data,
+              rainChkCount: rainChkRes.count,
             },
           }));
-        }else{
+        } else {
           toast.error("삭제시 오류가 발생하였습니다.. ");
 
         }
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index 37e385ca2..52f46e259 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -1,18 +1,24 @@
+import { buildingType } from "@/app/store/common/code";
+import type { TableUpperProps } from "@/app/store/common/type/header";
 import {
   TEST_UUID,
 } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
-import type {
-  SelectDataType,
-  SheetParameter,
-} from "@common/business_components";
 import {
   deleteFectch,
   fetchType,
+  getCountFetch,
   getFetch,
   postFectch,
   putFectch,
 } from "@/components/lib/api";
-import { buildingType } from "@/app/store/common/code";
+import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
+import type {
+  SelectDataType,
+  SheetParameter,
+} from "@common/business_components";
+import toast from "react-hot-toast";
+import { z } from "zod";
+import { type chHeadType } from "../rainChkgdn/headList";
 import { rswtMakeExcelSample } from "./excel";
 import {
   rswtChkgdZod,
@@ -20,15 +26,19 @@ import {
   rswtDetailHeadListExport,
   rswtHeadNmExport,
   rswtrDetailsZod,
+  rswtRuseHeadNmExport,
+  rswtSplHeadNmExport,
 } from "./headList";
-import { z } from "zod";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
-import { type chHeadType } from "../rainChkgdn/headList";
-import type { TableUpperProps } from "@/app/store/common/type/header";
+
+export const rswtPageSize = 5;
 
 const rswtChkHeadList = rswtChkHeadListExport;
 const rswtDetailHeadList = rswtDetailHeadListExport;
 const rswtHeadNm = rswtHeadNmExport;
+const rswtRuseHeadNm =rswtRuseHeadNmExport
+const rswtSplHeadNm =rswtSplHeadNmExport
+
+
 export type rswtChkZodType = z.infer<typeof rswtChkgdZod>;
 export type rswtrChkDetailsZodType = z.infer<typeof rswtrDetailsZod>;
 export type rswtChkgdnState = {
@@ -40,13 +50,29 @@ export type rswtChkgdnState = {
     excelList: SheetParameter[];
     rswtChkRes: rswtChkZodType[];
     rswtChkPolGuide: rswtChkZodType[];
+    rswtSplHeadNm:chHeadType[]
+    rswtRuseHeadNm:chHeadType[]
     isInit: boolean;
-    isSttn: boolean
+    isSttn: boolean;
+    isLoading:boolean;
+    rswtChkCount: number;
   };
 };
 
 type rswtChkgdnActions = {
-  rswtChkgdnInit: (pageNo: string, cnt: string, year: string, sggCd: string) => void;
+  rswtChkgdnInit: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string
+  ) => void;
+  rswtChkNmSearch: (
+    pageNo: number,
+    cnt: number,
+    year: string,
+    sggCd: string,
+    txt: string
+  ) => void;
   rswtrChkExcelDownload(
     sidoCode: SelectDataType[],
     sggCode: SelectDataType[]
@@ -67,21 +93,35 @@ export const rswtChkgdnStateExport: rswtChkgdnState = {
     rswtChkHeadList: rswtChkHeadList,
     rswtDetailHeadList: rswtDetailHeadList,
     rswtHeadNm: rswtHeadNm,
-    excelList: [{
-      data: [[]], headerNum: 0, headerRange: "A1:V3",
+    rswtRuseHeadNm:rswtRuseHeadNm,
+    rswtSplHeadNm:rswtSplHeadNm,
+
+    excelList: [
+      {
+        data: [[]],
+        headerNum: 0,
+        headerRange: "A1:V3",
       sheetName: "",
-      startCol: '1'
-    }],
+        startCol: "1",
+      },
+    ],
     rswtChkRes: [],
     rswtChkPolGuide: [],
     isInit: false,
     isSttn: false,
+    isLoading:false,
+    rswtChkCount: 1,
   },
 };
 
-const initFetch = async (pageNo: string, cnt: string, year: string | undefined, sgg: string | undefined) => {
+const initFetch = async (
+  pageNo: number,
+  cnt: number,
+  year: string | undefined,
+  sgg: string | undefined
+) => {
   const currentYear = new Date().getFullYear().toString();
-  const rswtChkRes = await getFetch(
+  const rswtChkRes = await getCountFetch(
     "wr",
     `/reuseChk/reuseWater` +
     (pageNo ? `/${pageNo}` : "/1") +
@@ -139,7 +179,13 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         },
       }));
     },
-    rswtChkgdnInit: async (pageNo: string, cnt: string, year: string, sggCd: string) => {
+    rswtChkgdnInit: async (
+      pageNo: number,
+      cnt: number,
+      year: string,
+      sggCd: string
+    ) => {
+      set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
       try {
         const rswtChkRes = await initFetch(pageNo, cnt, year, sggCd);
 
@@ -174,16 +220,18 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           "wr",
           `/reuseChk/reuseWater` +
             (pageNo ? `/${pageNo}` : "/1") +
-            (cnt ? `/${cnt}` : "/5") +
+            (cnt ? `/${cnt}` : "/20") +
             (year ? `/${year}` : `/${currentYear}`) +
             (sggCd ? `/${sggCd}` : "/0") +
             (txt ? `/${txt}` : "")
         );
+
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
             isInit: false,
           },
         }));
@@ -193,6 +241,8 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
     },
     rswtChkExceDataUpload: async (excelData: rswtChkZodType[]) => {
       try {
+   set((state: rswtChkgdnType) => (
+        { rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
         const res = await postFectch("/reuseChk/reuseWater", excelData);
         if (res.ok) {
           ToastFormUi({
@@ -201,65 +251,66 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           });
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
         console.log(error);
+      }finally{
+        set((state: rswtChkgdnType) => (
+          { rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
       }
+
     },
     rswtChkDetilsUpdate: async (rswtChk: rswtrChkDetailsZodType[]) => {
       try {
         const chData = await makeMdfrChk(rswtChk);
 
-
         const res = await putFectch("/reuseChk/reuseWater", chData);
         if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 과태료 수정 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+          toast.success("지도점검 과태료  수정이 완료되었습니다. ",)
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
         console.log(error);
-        alert("수정에 실패하였습니다.");
+        toast.error("지도점검 과태료  수정 오류입니다. ",)
+
       }
     },
     rswtChkDelete: async (chkgdnPks: number[]) => {
       try {
         const res = await deleteFectch(`/reuseChk/reuseWater`, chkgdnPks);
 
-        if (res.ok) {
-          ToastFormUi({
-            body: "삭제가 완료되었습니다. ",
-            title: "지도점검 삭제",
-          });
+        if (res) {
+          toast.success("삭제가 완료되었습니다.") 
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
             ...state.rswtChkgdn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
           },
         }));
       } catch (error) {
-        ToastFormUi({ body: "삭제를 실패했습니다.. ", title: "지도점검 삭제" });
+        toast.error("삭제 오류입니다.") 
       }
     },
     rswtChkPolAndGuide: async (chkGdnPk: number) => {
@@ -276,7 +327,11 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: rswtChkPolGuide,
           },
         }));
-      } catch (error) { }
+      } catch (error) {
+
+
+
+      }
     },
     rswtChkPolInit: () => {
       try {
@@ -287,7 +342,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtChkPolGuide: undefined,
           },
         }));
-      } catch (error) { }
+      } catch (error) {}
     },
     rwstPolAndGuideUpdate: async (rswtChk: rswtChkZodType[]) => {
       try {
@@ -297,13 +352,10 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           chData[0]
         );
         if (res.ok) {
-          ToastFormUi({
-            body: "지도점검 연간 수질 및 보급수/중수도 수정이 완료되었습니다. ",
-            title: "지도점검 수정",
-          });
+          toast.success("지도점검 연간 수질 및 대체수/중수도 수정이 완료되었습니다.") 
         }
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await initFetch("1", "20", currentYear, "0");
+        const rswtChkRes = await initFetch(1, rswtPageSize, currentYear, "0");
         return set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -313,10 +365,9 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
         }));
       } catch (error) {
         console.log(error);
-        ToastFormUi({
-          body: "지도점검 연간 수질 및 보급수/중수도 수정이 실패하였습니다.. ",
-          title: "지도점검 수정",
-        });
+
+        toast.error("지도점검 연간 수질 및 대체수/중수도 수정 오류입니다.") 
+
       }
     },
     rswtChkHeadChange: async (rswtChkgdn: rswtChkgdnState, isEdit: boolean) => {
@@ -337,7 +388,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             rswtDetailHeadList: rswtDetailHeadList,
           },
         }));
-      } catch (e) { }
+      } catch (e) {}
     },
   };
 };
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index 738354b04..e51c912d9 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -1,10 +1,10 @@
-import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import { getFetch } from "@/components/lib/api";
-import type { SelectDataType } from "@common/business_components/ui";
-import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
-import { rainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
-import { buildingExcelRainSttn } from "./excel";
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import { rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
+import { getCountFetch } from "@/components/lib/api";
+import type { SelectDataType } from "@common/business_components/ui";
+import { buildingExcelRainSttn } from "./excel";
+import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
 
 const fcltDiv = [
   { val: "RST", text: "중수도시설" },
@@ -15,7 +15,7 @@ const fcltDiv = [
 const rainChkgdnHeadList = rainChkgdnHeadSttnExport;
 const ruseHeadList = ruseSttnHeadListExport;
 const splHeadList = splSttnHeadListExport;
-const rainHeadNm = rainHeadNmExport
+const rainHeadNm = rainMainHeadNmExport
 
 const rainChk: rainChkZodType[] = [];
 
@@ -29,7 +29,8 @@ export type rainChkSttnState = {
     splHeadList: TableUpperProps[];
     sttnExcelList:[]
     isInit: boolean;
-    isSttn:boolean;
+    isSttn: boolean;
+    rainChkCount: number;
   };
 };
 
@@ -51,16 +52,21 @@ export const rainChkSttnStateExport: rainChkSttnState = {
     splHeadList: splHeadList,
     rainHeadNm:rainHeadNm, 
     isInit: false,
-    sttnExcelList:[],
-    isSttn:false,
+    sttnExcelList: [],
+    isSttn: false,
+    rainChkCount: 1,
   },
 };
 
-const initFetch = async (txt: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: number, cnt: number, txt: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
-  const rainRes = await getFetch(
+  const rainRes = await getCountFetch(
     "wr",
-    `/reuseChk/rainy/` + (txt ? `${txt}` : currentYear) + (sgg ? `/${sgg}` : "/0")
+    `/reuseChk/rainy` +
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/5") +
+    (txt ? `/${txt}` : `/${currentYear}`) +
+    (sgg ? `/${sgg}` : "/0")
   );
   return rainRes;
 };
@@ -68,15 +74,17 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
   set: any
 ) => {
   return {
-    rainChkSttnInit: async (searchTxt: string, sggCd: string) => {
+    rainChkSttnInit: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rainChkRes = await initFetch(searchTxt, sggCd);
+        const rainChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
 
         return set((state: rainChkSttnState) => ({
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            rainChkRes:rainChkRes
+            rainChkRes: rainChkRes.data,
+            rainChkCount: rainChkRes.count,
+            isSttn: true
           },
         }));
       } catch (error) {
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
index 965bc7275..f3643a094 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
@@ -1,14 +1,12 @@
 import { useWrStore } from "@/app/store";
-import { ScrollArea, Title } from "@common/business_components/ui";
-import { Button } from "@common/components/ui";
-import { useEffect, useState } from "react";
-import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
-import { GuideDetailsTable } from "@/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable";
+import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { splRuseWaterType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { rswtrPolutionsZode } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
+import { GuideDetailsTable } from "@/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable";
+import { ScrollArea, Title } from "@common/business_components/ui";
+import { Button } from "@common/components/ui";
+import React, { useEffect, useState } from "react";
 import type { z } from "zod";
-import React from "react";
-import type { TableUpperProps } from "@/app/store/common/type/header";
 
 export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
   const {
@@ -114,7 +112,6 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
       });
     }
 
-    console.log("result  ", result);
     setGuidData(result as splRuseWaterType[]);
 
     if (obj.rswtrPollutions) {
@@ -217,12 +214,14 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
     obj.guideDetails = realGuideDetail;
     if (type === "RNB") {
       rainChkGuidUpdate(obj);
+      setIsModal(false)
     } else {
       const polution = Object.values(upPolutionData)
         .flat()
         .filter((item) => item.utztnUsgCd !== "평균");
       obj.rswtrPollutions = polution;
       rwstPolAndGuideUpdate([obj]);
+      setIsModal(false)
     }
   };
 
@@ -248,7 +247,8 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
         </div>
         <div className="flex justify-between">
           <h3 className="text-2xl font-bold text-gray-900 mt-2 ml-6">
-            {`(${obj.bdstNm})`}
+            {type === "RNB"
+              ? `(${obj.bdstNm})` : `(${obj.building.bdstNm})`}
           </h3>
           {!rainChkSttn.isSttn ? (
             <Button className="" onClick={allDataUpdate}>
@@ -262,12 +262,13 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
         <ScrollArea className="h-[60vh]">
           <div className="card-header">
             <h3 className="text-2xl font-medium text-label">
-              {`연간보급수이용량`}
+              {`연간대체수이용량`}
             </h3>
           </div>
           <GuideDetailsTable
             chgRes={guidData || []}
-            headList={headList.ruseHeadList}
+            headList={headList.splHeadList}
+            upheadList={type === "RNB" ? rainChkgdn.rainSplHeadNm : rswtChkgdn.rswtSplHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
@@ -280,7 +281,8 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
           </div>
           <GuideDetailsTable
             chgRes={guidData || []}
-            headList={headList.splHeadList}
+            headList={headList.ruseHeadList}
+            upheadList={type === "RNB" ? rainChkgdn.rainRuseHeadNm : rswtChkgdn.rswtRuseHeadNm}
             type={""}
             setChGuidData={(data) => {
               setChGuidData(data);
@@ -302,6 +304,7 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
                     <GuideDetailsTable
                       chgRes={value}
                       headList={headList?.rswtDetailHeadList}
+                      upheadList={rswtChkgdn.rswtSplHeadNm}
                       type={""}
                       setChGuidData={(data) => {
                         getPolutionData(data);
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index 720a73ab4..2525cfd27 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -1,22 +1,22 @@
 "use client";
 import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
 import { useWrStore } from "@/app/store";
-import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
-import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { tableData } from "@/components/lib/func/commom";
 import {
   chRowspanTable,
-  headVisibleChange,
   rainChkTableData
 } from "@/components/lib/func/TableData";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
+import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 import {
   Table,
   TableBody,
   TableHeader,
 } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
-import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 export default function RainChkgdTable({
   detailUp,
   handleClick = () => { },
@@ -24,6 +24,7 @@ export default function RainChkgdTable({
   rainChkData,
   pageNation,
   onPageChange,
+  pageCount,
 }: {
   detailUp: (data: rainChkZodType[]) => void;
   handleClick?: (data: any) => void;
@@ -31,6 +32,7 @@ export default function RainChkgdTable({
   rainChkData?: rainChkZodType[];
   pageNation: number;
   onPageChange: (page: number) => void;
+  pageCount: number;
 }) {
   const { code, rainChkgdn, rainChkSttn, getRainSttnExcel } = useWrStore((state) => state);
   const [makeTableData, setMakeTableData] = useState<any[]>([]);
@@ -70,16 +72,12 @@ export default function RainChkgdTable({
   }, [makeTableData, handleClick]);
 
 
-  useEffect(() =>{
-
-
-  },[rainChkgdn.rainChk])
 
   useEffect(() => {
     setSelectedIds([])// 셀렉트 초기화를 위한 작업
-    if (rainChkData) {
+    if (rainChkData && rainChkData.length > 0) {
 
-      const rainChg = rainChkData.map((item: any) => {
+      const rainChg = rainChkData?.map((item: any) => {
         const bud = tableData([item.building], { code });
         return {
           ...item,
@@ -89,6 +87,8 @@ export default function RainChkgdTable({
       });
 
       setMakeTableData(rainChkTableData(rainChg));
+    } else {
+      setMakeTableData([]);
     }
   }, [rainChkData, code]);
 
@@ -167,16 +167,15 @@ export default function RainChkgdTable({
     } else {
       setHeadList({
         headList: rainChkgdn.rainChkgdnHeadList,
-        upHeadList: rainChkgdn.rainHeadNm
+        upHeadList: rainChkgdn.rainMainHeadNm
       })
 
     }
-
   }, [rainChkSttn.isSttn, rainChkgdn.rainChkgdnHeadList, rainChkSttn.rainChkgdnHeadList]);
 
-
   return (
     <>
+      <LoadingOverlay isLoading={rainChkgdn.isLoading}></LoadingOverlay>
       <Table variant="secondary">
         <TableHeader className="font-bold">
           {headMakeprfmnc(
@@ -197,9 +196,9 @@ export default function RainChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rainChkData?.length ?? 0}
+        total={pageCount}
         cur={pageNation}
-        pageSize={20}
+        pageSize={rainPageSize}
         onPageChange={onPageChange}
       />
     </>
diff --git a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
index 31891a595..bc8581b75 100644
--- a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
@@ -1,20 +1,22 @@
 "use client";
 import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
 import { useWrStore } from "@/app/store";
-import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
-import type {
-  rswtChkZodType,
-  rswtrChkDetailsZodType,
-} from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import type { TableUpperProps } from "@/app/store/common/type/header";
+import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
+import {
+  rswtPageSize,
+  type rswtChkZodType,
+  type rswtrChkDetailsZodType,
+} from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import { tableData } from "@/components/lib/func/commom";
 import {
   chRowspanTable,
   rswtChkTableData,
 } from "@/components/lib/func/TableData";
+import LoadingOverlay from "@common/business_components/ui/loadingBar";
+import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 import { Table, TableBody, TableHeader } from "@common/components/ui";
 import { useCallback, useEffect, useState } from "react";
-import UiPageNations from "@common/business_components/ui/table/uiPageNations";
 
 export default function RswtChkgdTable({
   detaiRswtlUpdate,
@@ -23,6 +25,7 @@ export default function RswtChkgdTable({
   rswtChkData,
   pageNation,
   onPageChange,
+  pageCount,
 }: {
   detaiRswtlUpdate: (data: rswtrChkDetailsZodType[]) => void;
   handleRswtClick?: (data: any) => void;
@@ -30,6 +33,7 @@ export default function RswtChkgdTable({
   rswtChkData: rswtChkZodType[];
   pageNation: number;
   onPageChange: (page: number) => void;
+  pageCount: number;
 }) {
   const { code, rswtChkgdn, rswtChkSttn, rswtChkgdnInit, rswtChkPolAndGuide, getRswtSttnExcel } = useWrStore(
     (state) => state
@@ -133,6 +137,7 @@ export default function RswtChkgdTable({
 
   return (
     <>
+      <LoadingOverlay isLoading={rswtChkgdn.isLoading}></LoadingOverlay>
       <Table variant="secondary">
         <TableHeader className="font-bold">
           {headMakeprfmnc(headList?.headList, headList?.upHeadList)}
@@ -150,9 +155,9 @@ export default function RswtChkgdTable({
         </TableBody>
       </Table>
       <UiPageNations
-        total={rswtChkData?.length ?? 0}
+        total={pageCount}
         cur={pageNation}
-        pageSize={20}
+        pageSize={rswtPageSize}
         onPageChange={onPageChange}
       />
     </>

From 011b87784d2cc8e4f17e79acf91eea6c1c7d3775 Mon Sep 17 00:00:00 2001
From: truthwing <truthplumage@gmail.com>
Date: Fri, 4 Jul 2025 16:12:08 +0900
Subject: [PATCH 28/44] djlee product

---
 .../prfmncReg/chkgdnReg/TableHead.tsx         |  6 ++---
 .../chkgdnReg/rainChkgdn/headList.tsx         | 16 ++++++++++++--
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  |  6 ++---
 .../chkgdnReg/rswrtChkgdn/headList.tsx        | 22 +++++++++++++++++--
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx |  6 ++---
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       |  8 +++----
 .../chkgdnSttn/rswtChkgdnSttn/index.tsx       |  8 +++----
 .../chkgdTable/rainChkgd/rainChkgdTable.tsx   |  2 +-
 .../src/ui/loadingBar/index.tsx               | 20 +++++++++++++++++
 9 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 packages/common/business_components/src/ui/loadingBar/index.tsx

diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead.tsx
index 10a0bf85f..28ba6c512 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead.tsx
@@ -26,10 +26,10 @@ export const headMakeprfmnc = (
                   key={head.id}
                   rowSpan={1}
                   colSpan={
-                    makeHeadNm.find((ch) => ch.headNm === head.upName)?.length
+                    makeHeadNm?.find((ch) => ch.headNm === head.upName)?.length
                   }
                 >
-                  {makeHeadNm.find((ch) => ch.headNm === head.upName)?.text}
+                  {makeHeadNm?.find((ch) => ch.headNm === head.upName)?.text}
                 </TableHead>
               ) : null
             )}
@@ -39,7 +39,7 @@ export const headMakeprfmnc = (
           {upHeadList
             .filter((data) => data.visible != false)
             .map((head: TableUpperProps) =>
-              makeHeadNm.find((ch) => ch.headNm === head.upName) ? (
+              makeHeadNm?.find((ch) => ch.headNm === head.upName) ? (
                 <TableHead
                   className={`border border-gray-600 px-2 py-1 `}
                   key={head.id}
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
index d7335e129..3cf1b5b11 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
@@ -114,10 +114,22 @@ export type splRuseWaterType = {
   ruse12: number;
 };
 
-export const rainHeadNmExport: chHeadType[] = [
+export const rainMainHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+];
+
+export const rainRuseHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "ruseWater", text: "연간대체수 이용량(m³)", length: 13 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+];
+
+
+export const rainSplHeadNmExport: chHeadType[] = [
   { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
   { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
-  { headNm: "ruseWater", text: "연간보급수 이용량(m³)", length: 13 },
   { headNm: "detailQulity", text: "분기", length: 11 },
   { headNm: "splWater", text: "연간빗물 이용량(m³)", length: 13 },
 ];
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index e256b4ef4..36e8672f5 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -4,8 +4,8 @@ import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   deleteFectch,
   fetchType,
-  getCountFetch,
   getFetch,
+  getFetchWithCount,
   postFectch,
   putFectch,
 } from "@/components/lib/api";
@@ -133,7 +133,7 @@ const initFetch = async (
 ) => {
   const currentYear = new Date().getFullYear().toString();
 
-  const rainRes = await getCountFetch(
+  const rainRes = await getFetchWithCount(
     "wr",
     `/reuseChk/rainy` +
       (pageNo ? `/${pageNo}` : "/1") +
@@ -235,7 +235,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
     ) => {
       try {
         const currentYear = new Date().getFullYear();
-        const rainChkRes = await getCountFetch(
+        const rainChkRes = await getFetchWithCount(
           "wr",
           `/reuseChk/rainy` +
             (pageNo ? `/${pageNo}` : "/1") +
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
index 0e690dbb9..c9fc9f078 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList.tsx
@@ -1,6 +1,6 @@
+import type { TableUpperProps } from "@/app/store/common/type/header";
 import { z } from "zod";
 import { guideDetail, type chHeadType } from "../rainChkgdn/headList";
-import type { TableUpperProps } from "@/app/store/common/type/header";
 
 export type polutionType = {
   chkgdnDtlFk: number;
@@ -109,6 +109,24 @@ export const rswtChkgdZod = z.object({
   rswtrPollutions: z.array(rswtrPolutionsZode),
 });
 
+
+
+export const rswtRuseHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "ruseWater", text: "연간중수 이용량(m³)", length: 13 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+];
+
+export const rswtSplHeadNmExport: chHeadType[] = [
+  { headNm: "useQuilty", text: "이용수질(필요시)", length: 3 },
+  { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
+  { headNm: "detailQulity", text: "분기", length: 11 },
+  { headNm: "splWater", text: "연간대체수 이용량(m³)", length: 13 },
+];
+
+
+
 export const rswtHeadNmExport: chHeadType[] = [
   { headNm: "useQuilty", text: "연간 평균 이용수질", length: 10 },
   { headNm: "feeHist", text: "과태료 부과내역", length: 3 },
@@ -126,7 +144,7 @@ export const rswtChkHeadListExport: TableUpperProps[] = [
   { id: "spwtPositn", title: "채수지점" ,mergeCell: true},
   { id: "chckYmd", title: "점검일" ,mergeCell: true},
   { id: "utztnUsgCd", title: "이용용도" },
-  { id: "splyUswtrUtztnQnt", title: "연간보급수이용량(m³)" ,type: "number"},
+  { id: "splyUswtrUtztnQnt", title: "연간대체수이용량(m³)" ,type: "number"},
   { id: "ruseFcltUtztnQnt", title: "연간중수도이용량(m³)",type: "number"},
 
   {
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index 52f46e259..49e1c0906 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -6,8 +6,8 @@ import {
 import {
   deleteFectch,
   fetchType,
-  getCountFetch,
   getFetch,
+  getFetchWithCount,
   postFectch,
   putFectch,
 } from "@/components/lib/api";
@@ -121,7 +121,7 @@ const initFetch = async (
   sgg: string | undefined
 ) => {
   const currentYear = new Date().getFullYear().toString();
-  const rswtChkRes = await getCountFetch(
+  const rswtChkRes = await getFetchWithCount(
     "wr",
     `/reuseChk/reuseWater` +
     (pageNo ? `/${pageNo}` : "/1") +
@@ -216,7 +216,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
     ) => {
       try {
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await getCountFetch(
+        const rswtChkRes = await getFetchWithCount(
           "wr",
           `/reuseChk/reuseWater` +
             (pageNo ? `/${pageNo}` : "/1") +
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index e51c912d9..059433593 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -1,7 +1,7 @@
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import { rainMainHeadNmExport, type chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
-import { getCountFetch } from "@/components/lib/api";
+import { getFetchWithCount } from "@/components/lib/api";
 import type { SelectDataType } from "@common/business_components/ui";
 import { buildingExcelRainSttn } from "./excel";
 import { rainChkgdnHeadSttnExport, ruseSttnHeadListExport, splSttnHeadListExport } from "./headList";
@@ -17,8 +17,6 @@ const ruseHeadList = ruseSttnHeadListExport;
 const splHeadList = splSttnHeadListExport;
 const rainHeadNm = rainMainHeadNmExport
 
-const rainChk: rainChkZodType[] = [];
-
 export type rainChkSttnState = {
   rainChkSttn: {
     rainChkRes: rainChkZodType[];
@@ -60,7 +58,7 @@ export const rainChkSttnStateExport: rainChkSttnState = {
 
 const initFetch = async (pageNo: number, cnt: number, txt: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
-  const rainRes = await getCountFetch(
+  const rainRes = await getFetchWithCount(
     "wr",
     `/reuseChk/rainy` +
     (pageNo ? `/${pageNo}` : "/1") +
@@ -100,7 +98,7 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
     ) => {
       try {
         const currentYear = new Date().getFullYear();
-        const rainChkRes = await getCountFetch(
+        const rainChkRes = await getFetchWithCount(
           "wr",
           `/reuseChk/rainy` +
           (pageNo ? `/${pageNo}` : "/1") +
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
index 251ff1fa2..9db75de07 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
@@ -1,10 +1,10 @@
-import { rswtHeadNmExport } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
-import { rswtChkSttnHeadListExport, rswtDetailSttnHeadListExport } from "./headList";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import type { rswtChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
-import { getFetch } from "@/components/lib/api";
+import { rswtHeadNmExport } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/headList";
+import { getFetch, getFetchWithCount } from "@/components/lib/api";
 import { buildingExcelRswtSttn } from "./excel";
+import { rswtChkSttnHeadListExport, rswtDetailSttnHeadListExport } from "./headList";
 
 const rswtChkHeadList = rswtChkSttnHeadListExport;
 const rswtDetailHeadList = rswtDetailSttnHeadListExport;
@@ -113,7 +113,7 @@ export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
     ) => {
       try {
         const currentYear = new Date().getFullYear().toString();
-        const rswtChkRes = await getCountFetch(
+        const rswtChkRes = await getFetchWithCount(
           "wr",
           `/reuseChk/reuseWater` +
           (pageNo ? `/${pageNo}` : "/1") +
diff --git a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
index 2525cfd27..aba225687 100644
--- a/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx
@@ -2,7 +2,7 @@
 import { headMakeprfmnc } from "@/app/ruseFcltMng/prfmncReg/chkgdnReg/TableHead";
 import { useWrStore } from "@/app/store";
 import type { TableUpperProps } from "@/app/store/common/type/header";
-import { type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import { rainPageSize, type rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { tableData } from "@/components/lib/func/commom";
 import {
diff --git a/packages/common/business_components/src/ui/loadingBar/index.tsx b/packages/common/business_components/src/ui/loadingBar/index.tsx
new file mode 100644
index 000000000..4d637dd25
--- /dev/null
+++ b/packages/common/business_components/src/ui/loadingBar/index.tsx
@@ -0,0 +1,20 @@
+import { LoadingWithAnimation } from '@common/components/ui/loading';
+import React from 'react';
+
+interface LoadingOverlayProps {
+  isLoading: boolean;
+}
+
+const LoadingOverlay: React.FC<LoadingOverlayProps> = ({ isLoading }) => {
+  if (!isLoading) return null;
+
+  return (
+    <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50">
+      <div className="relative w-16 h-16">
+        <LoadingWithAnimation color="primary" />
+      </div>
+    </div>
+  );
+};
+
+export default LoadingOverlay;
\ No newline at end of file

From 60c06bd50544069170f7bc50bc304cda1239ca69 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Fri, 4 Jul 2025 18:13:07 +0900
Subject: [PATCH 29/44] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=A0=90=EA=B2=80?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20merge=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prfmncSttn/chkgdnSttn/page.tsx            |  4 +-
 .../prfmncReg/chkgdnReg/rainChkgdn/index.tsx  | 41 +++++++++----------
 .../prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx | 17 ++++----
 .../chkgdnSttn/rainChkgdnSttn/index.tsx       | 12 +++---
 .../chkgdnSttn/rswtChkgdnSttn/index.tsx       | 22 ++++++----
 .../ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx  | 21 ++++------
 .../ui/modal/chkgd/chkgdModal/chkgdModal.tsx  |  2 +-
 .../guideDetailTable/guideDetailTable.tsx     | 27 ++++++------
 .../chkgdTable/rswtChkgd/rswtChkgdTable.tsx   |  1 -
 9 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
index f8669bd2c..a191de9ee 100644
--- a/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncSttn/chkgdnSttn/page.tsx
@@ -79,7 +79,8 @@ export default function Page() {
       }
     }
   };
-const rainPageChange = (pageNo: number) => {
+
+  const rainPageChange = (pageNo: number) => {
     if (pageNo > 0) {
       setRainPageNation(pageNo);
       rainChkSttnInit(pageNo, rainPageSize, searchYear, commonCd);
@@ -96,6 +97,7 @@ const rainPageChange = (pageNo: number) => {
   useEffect(() => {
     if (!rainChkSttn.isInit) {
       isRainSttn(true)
+      console.log("여기", rainPageSize)
       rainChkSttnInit(1, rainPageSize, new Date().getFullYear().toString(), commonCd);
       setIsModal({ data: {}, open: false });
     }
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
index 36e8672f5..069f1f760 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx
@@ -45,16 +45,15 @@ const rainChk: rainChkZodType[] = [];
 export type rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: TableUpperProps[];
-    rainSplHeadNm:chHeadType[]
-    rainRuseHeadNm:chHeadType[]
+    rainSplHeadNm: chHeadType[]
+    rainRuseHeadNm: chHeadType[]
     rainChk: rainChkZodType[];
-    rainHeadNm: chHeadType[];
     ruseHeadList: TableUpperProps[];
     splHeadList: TableUpperProps[];
     isInit: boolean;
     isModalClose: boolean;
     fcltDiv: SelectDataType[];
-    rainMainHeadNm:chHeadType[]
+    rainMainHeadNm: chHeadType[]
     excelList: [];
     isSttn: boolean;
     rainChkCount: number;
@@ -93,8 +92,8 @@ export const rainChkgdnStateExport: rainChkgdnState = {
   rainChkgdn: {
     rainChkgdnHeadList: rainChkgdnHeadList,
     rainRuseHeadNm: rainRuseHeadNm,
-    rainSplHeadNm:rainSplHeadNm,
-    rainMainHeadNm:rainMainHeadNm,
+    rainSplHeadNm: rainSplHeadNm,
+    rainMainHeadNm: rainMainHeadNm,
     rainChk: rainChk,
     splHeadList: splHeadList,
     ruseHeadList: ruseHeadList,
@@ -136,10 +135,10 @@ const initFetch = async (
   const rainRes = await getFetchWithCount(
     "wr",
     `/reuseChk/rainy` +
-      (pageNo ? `/${pageNo}` : "/1") +
-      (cnt ? `/${cnt}` : "/10") +
-      (year ? `/${year}` : `/${currentYear}`) +
-      (sgg ? `/${sgg}` : "/0")
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/10") +
+    (year ? `/${year}` : `/${currentYear}`) +
+    (sgg ? `/${sgg}` : "/0")
   );
 
   return rainRes;
@@ -204,7 +203,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       year: string,
       sggCd: string
     ) => {
-      set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
+      // set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: true } }));
       try {
         const rainChkRes = await initFetch(pageNo, cnt, year, sggCd);
         set((state: rainChkgdnState) => ({
@@ -213,17 +212,17 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
             ...state.rainChkgdn,
             rainChk: rainChkRes.data,
             rainChkCount: rainChkRes.count,
-            isInit: true, // 무한 루프 방지를 위해 isInit을 true로 설정
+            isInit: false, // 무한 루프 방지를 위해 isInit을 true로 설정
           },
         }));
       } catch (error) {
         console.log(error);
         // 에러가 발생하더라도 무한 루프에 빠지지 않도록 isInit을 true로 설정합니다.
-        set((state: rainChkgdnType) => ({
-          rainChkgdn: { ...state.rainChkgdn, isInit: true },
-        }));
+        // set((state: rainChkgdnType) => ({
+        //   rainChkgdn: { ...state.rainChkgdn, isInit: true },
+        // }));
       } finally {
-        set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
+        // set((state: rainChkgdnType) => ({ rainChkgdn: { ...state.rainChkgdn, isLoading: false } }));
       }
     },
     rainChkNmSearch: async (
@@ -238,11 +237,11 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         const rainChkRes = await getFetchWithCount(
           "wr",
           `/reuseChk/rainy` +
-            (pageNo ? `/${pageNo}` : "/1") +
-            (cnt ? `/${cnt}` : "/10") +
-            (year ? `/${year}` : `/${currentYear}`) +
-            (sggCd ? `/${sggCd}` : "/0") +
-            (txt ? `/${txt}` : "")
+          (pageNo ? `/${pageNo}` : "/1") +
+          (cnt ? `/${cnt}` : "/10") +
+          (year ? `/${year}` : `/${currentYear}`) +
+          (sggCd ? `/${sggCd}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
         return set((state: rainChkgdnState) => ({
           ...state,
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
index 49e1c0906..4f647da1e 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/index.tsx
@@ -185,10 +185,12 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
       year: string,
       sggCd: string
     ) => {
-      set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
+      // set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: true } }));
       try {
         const rswtChkRes = await initFetch(pageNo, cnt, year, sggCd);
 
+        console.log("rswtChkRes", rswtChkRes)
+
         set((state: rswtChkgdnState) => ({
           ...state,
           rswtChkgdn: {
@@ -199,12 +201,12 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
           },
         }));
       } catch (error) {
-        console.log(error);
-        set((state: rswtChkgdnType) => ({
-          rswtChkgdn: { ...state.rswtChkgdn, isInit: true },
-        }));
+        // console.log(error);
+        // set((state: rswtChkgdnType) => ({
+        //   rswtChkgdn: { ...state.rswtChkgdn, isInit: true },
+        // }));
       } finally {
-        set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
+        // set((state: rswtChkgdnType) => ({ rswtChkgdn: { ...state.rswtChkgdn, isLoading: false } }));
       }
     },
     rswtChkNmSearch: async (
@@ -215,6 +217,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
       txt: string
     ) => {
       try {
+        console.log("여기")
         const currentYear = new Date().getFullYear().toString();
         const rswtChkRes = await getFetchWithCount(
           "wr",
@@ -232,7 +235,7 @@ export const rswtChkgdnActionsExport: (set: any) => rswtChkgdnActions = (
             ...state.rswtChkgdn,
             rswtChkRes: rswtChkRes.data,
             rswtChkCount: rswtChkRes.count,
-            isInit: false,
+            // isInit: false,
           },
         }));
       } catch (error) {
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
index 059433593..e99bdb7a8 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rainChkgdnSttn/index.tsx
@@ -22,10 +22,10 @@ export type rainChkSttnState = {
     rainChkRes: rainChkZodType[];
     fcltDiv: SelectDataType[];
     rainChkgdnHeadList: TableUpperProps[];
-    rainHeadNm:chHeadType[];
+    rainHeadNm: chHeadType[];
     ruseHeadList: TableUpperProps[];
     splHeadList: TableUpperProps[];
-    sttnExcelList:[]
+    sttnExcelList: []
     isInit: boolean;
     isSttn: boolean;
     rainChkCount: number;
@@ -48,7 +48,7 @@ export const rainChkSttnStateExport: rainChkSttnState = {
     rainChkgdnHeadList: rainChkgdnHeadList,
     ruseHeadList: ruseHeadList,
     splHeadList: splHeadList,
-    rainHeadNm:rainHeadNm, 
+    rainHeadNm: rainHeadNm,
     isInit: false,
     sttnExcelList: [],
     isSttn: false,
@@ -125,13 +125,13 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            isSttn:isSttn
+            isSttn: isSttn
           },
         }));
       } catch (error) {
         console.log(error);
       }
-    },getRainSttnExcel: async (excelList:rainChkZodType[]) => {
+    }, getRainSttnExcel: async (excelList: rainChkZodType[]) => {
       try {
 
         const excelData = buildingExcelRainSttn(excelList)
@@ -140,7 +140,7 @@ export const rainChkSttnActionsExport: (set: any) => rainChkSttnActions = (
           ...state,
           rainChkSttn: {
             ...state.rainChkSttn,
-            sttnExcelList:excelData
+            sttnExcelList: excelData
           },
         }));
       } catch (error) {
diff --git a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
index 9db75de07..7891d73fb 100644
--- a/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
+++ b/apps/wr/app/store/prfmncSttn/chkgdnSttn/rswtChkgdnSttn/index.tsx
@@ -20,11 +20,12 @@ export type rswtChkSttnState = {
     rswtChkRes: rswtChkZodType[];
     isInit: boolean;
     isSttn: boolean;
+    rswtChkCount: number;
   };
 };
 
 type rswtChkSttnActions = {
-  rswtChkSttnInit: (searchTxt: string, sggCd: string) => void;
+  rswtChkSttnInit: (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => void;
   isRswtSttn: (isSttn: boolean) => void;
   getRswtSttnExcel: (excelList: rswtChkZodType[]) => void;
   rswtChkNmSttnSearch: (pageNo: number, cnt: number, year: string, sggCd: string, txt: string) => void;
@@ -41,33 +42,36 @@ export const rswtChkStateExport: rswtChkSttnState = {
     rswtChkRes: [],
     isInit: false,
     isSttn: false,
+    rswtChkCount: 1,
   },
 };
 
-const initFetch = async (year: string | undefined, sgg: string | undefined) => {
+const initFetch = async (pageNo: number, cnt: number, year: string | undefined, sgg: string | undefined) => {
   const currentYear = new Date().getFullYear().toString();
-  const rswtChkRes = await getFetch(
+  const rswtChkRes = await getFetchWithCount(
     "wr",
-    `/reuseChk/reuseWater/` +
-    (year ? `${year}` : currentYear) +
+    `/reuseChk/reuseWater` +
+    (pageNo ? `/${pageNo}` : "/1") +
+    (cnt ? `/${cnt}` : "/20") +
+    (year ? `/${year}` : `/${currentYear}`) +
     (sgg ? `/${sgg}` : "/0")
   );
   return rswtChkRes;
 };
 
-
 export const rswtChkSttnActionsExport: (set: any) => rswtChkSttnActions = (
   set: any
 ) => {
   return {
-    rswtChkSttnInit: async (searchTxt: string, sggCd: string) => {
+    rswtChkSttnInit: async (pageNo: number, cnt: number, searchTxt: string, sggCd: string) => {
       try {
-        const rswtChkRes = await initFetch(searchTxt, sggCd);
+        const rswtChkRes = await initFetch(pageNo, cnt, searchTxt, sggCd);
         return set((state: rswtChkSttnState) => ({
           ...state,
           rswtChkSttn: {
             ...state.rswtChkSttn,
-            rswtChkRes: rswtChkRes,
+            rswtChkRes: rswtChkRes.data,
+            rswtChkCount: rswtChkRes.count,
             isInit: false,
           },
         }));
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
index 8828420b8..5aa67fd3a 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx
@@ -7,11 +7,9 @@ import {
   excelToRswtGuideData,
   excelToRswtPolution,
 } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import {
   filePicked,
   filePickedArray,
-  FileUpload,
   Form,
   FormField,
   FormUi,
@@ -26,7 +24,7 @@ import { useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import type { z } from "zod";
 
-export default function ChkgdExcel({ type }: { type: string }) {
+export default function ChkgdExcel({ type,setIsRegExcel  }: { type: string, setIsRegExcel:(open:boolean) =>void }) {
   const { rswtChkgdn, rainChkExcelDataUPload, rswtChkExceDataUpload } =
     useWrStore((state) => {
       return state;
@@ -146,29 +144,28 @@ export default function ChkgdExcel({ type }: { type: string }) {
 
   const onSubmit = (values: z.infer<typeof chkgdRegExcel>) => {
     if (values.chckYr === "") {
-      ToastFormUi({ body: "등록년도를 작성해주세요", title: "지도점검 등록" });
+      toast.error("등록년도를 작성해주세요");
       return;
     }
 
     if (type === "RNB") {
       if (excelData === undefined || excelData?.length === 0) {
-        ToastFormUi({
-          body: "빈 파일 및 파일 오류 입니다.",
-          title: "지도점검 등록",
-        });
+        toast.error("빈 파일 및 파일 오류 입니다.");
+
         return;
       } else {
         rainChkExcelDataUPload(excelData as rainChkZodType[]);
+        setIsRegExcel(false)
       }
     } else if (type === "RST") {
       if (excelRswtData === undefined || excelRswtData?.length === 0) {
-        ToastFormUi({
-          body: "빈 파일 및 파일 오류 입니다.",
-          title: "중수지도점검 등록",
-        });
+        toast.error("빈 파일 및 파일 오류 입니다.");
+
         return;
       } else {
         rswtChkExceDataUpload(excelRswtData as rswtChkZodType[]);
+        setIsRegExcel(false)
+
       }
     }
   };
diff --git a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
index f3643a094..edbd9e570 100644
--- a/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx
@@ -8,7 +8,7 @@ import { Button } from "@common/components/ui";
 import React, { useEffect, useState } from "react";
 import type { z } from "zod";
 
-export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
+export default function ChkgdModal({ type, obj, setIsModal }: { type: string; obj: any, setIsModal: (open: boolean) => void }) {
   const {
     rainChkgdn,
     rswtChkgdn,
diff --git a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
index 94be4ebb6..627537dcb 100644
--- a/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx
@@ -4,6 +4,7 @@ import { useWrStore } from "@/app/store";
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import type {
 } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import type { chHeadType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList";
 import { InputTableBody } from "@/components/lib/func/TableData";
 import {
   Input,
@@ -13,16 +14,18 @@ import {
   TableHeader,
   TableRow,
 } from "@common/components/ui";
-import {  useEffect, useState, type Dispatch, type SetStateAction } from "react";
+import { useEffect, useState, type Dispatch, type SetStateAction } from "react";
 
 export function GuideDetailsTable({
   chgRes,
   headList,
+  upheadList,
   type,
   setChGuidData,
 }: {
   chgRes: any[];
-  headList: TableUpperProps[]; 
+  headList: TableUpperProps[];
+  upheadList: chHeadType[];
   type: string;
   setChGuidData: (chgRes: any[]) => void;
 }) {
@@ -35,21 +38,21 @@ export function GuideDetailsTable({
 
 
   useEffect(() => {
-    setChGuidData(inputData??[] );
+    setChGuidData(inputData ?? []);
 
   }, [inputData]);
 
- 
+
   return (
     <>
-  <div className={`card !m-[1.2rem] !p-0r `}> 
-      <Table variant="secondary">
-        <TableHeader className="font-bold">{headMakeprfmnc(headList, rainChkgdn?.rainHeadNm)}</TableHeader>
-        <TableBody >
-         {InputTableBody(inputData ?? [],headList, setInputData) }
-        </TableBody>
-      </Table>
-  </div>
+      <div className={`card !m-[1.2rem] !p-0r `}>
+        <Table variant="secondary">
+          <TableHeader className="font-bold">{headMakeprfmnc(headList, upheadList)}</TableHeader>
+          <TableBody >
+            {InputTableBody(inputData ?? [], headList, setInputData)}
+          </TableBody>
+        </Table>
+      </div>
     </>
   );
 }
diff --git a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
index bc8581b75..7a43df3d8 100644
--- a/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
+++ b/apps/wr/components/ui/table/chkgdTable/rswtChkgd/rswtChkgdTable.tsx
@@ -76,7 +76,6 @@ export default function RswtChkgdTable({
   }, [rswtChkgdn.rswtChkPolGuide]);
 
   useEffect(() => {
-    console.log("makeTableData ", makeTableData)
     getRswtSttnExcel(makeTableData)
     const selectedData = makeTableData
       .map((item) => {

From f4f3d2a3e9b662f1ef1478848078088a1f5116a8 Mon Sep 17 00:00:00 2001
From: yschoi <yschoi>
Date: Fri, 4 Jul 2025 18:36:54 +0900
Subject: [PATCH 30/44] =?UTF-8?q?=EB=AF=B8=EB=8B=88=EB=A7=B5=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/wr/app/map/htdflSttn/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wr/app/map/htdflSttn/page.tsx b/apps/wr/app/map/htdflSttn/page.tsx
index e74d055d8..7b804b7cd 100644
--- a/apps/wr/app/map/htdflSttn/page.tsx
+++ b/apps/wr/app/map/htdflSttn/page.tsx
@@ -124,7 +124,7 @@ const Map = () => {
         treeData={treeData}
         isSearch={false}
         gisMaps={gisMaps}
-        isMiniMap={true}
+        isMiniMap={false}
         searchView={undefined}
         // searchView={(props: any) => (
         //   <MapSearchBar

From 7c34c87aafb0aea6b7d2537c607d71d258f3ccae Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Fri, 4 Jul 2025 19:29:10 +0900
Subject: [PATCH 31/44] =?UTF-8?q?=EC=98=A8=EB=B0=B0=EC=88=98=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/htdflReg/page.tsx | 28 +++++++---
 .../ruseFcltMng/fcltReg/htdflReg/index.tsx    | 53 ++++++++++++++-----
 .../ruseFcltMng/fcltReg/rswtReg/index.tsx     |  2 +-
 .../ui/form/fcltReg/bdstReg/bdstReg.tsx       | 10 ++--
 .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx |  2 -
 .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 19 ++++++-
 .../fcltReg/bdstRegModal/bdstRegModal.tsx     |  2 +-
 7 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
index 33cfa3bba..9b3688e61 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/htdflReg/page.tsx
@@ -21,9 +21,10 @@ import type { chgBuilding } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import BdstChgModal from "@/components/ui/modal/fcltReg/bdstChgModal/bdstChgModal";
 import type { customHtdflBdst } from "@/app/store/ruseFcltMng/fcltReg/htdflReg";
 import { BdstReg } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
+import { Toaster } from "react-hot-toast";
 
 export default function Home() {
-  const { code, htdfl, initHtdfl, getHtdflBdstData } = useWrStore(
+  const { code, htdfl, initHtdflReg, getHtdflBdstData ,htdflNmSearch} = useWrStore(
     (state) => state
   );
   const [searchTxt, setSearchTxt] = useState("");
@@ -42,18 +43,27 @@ export default function Home() {
 
   useEffect(() => {
     if (!htdfl.isInit) {
+      initHtdflReg('41')
     }
-  }, [htdfl.isInit, initHtdfl]);
+  }, [htdfl.isInit, initHtdflReg]);
   useEffect(() => {
-    if (code.sggCd.length > 0) {
+    if (htdflRes&&htdflRes.length>0) {
+
+      console.log('htdflRes ', htdflRes)
       const htdflData = tableData(htdflRes, { code }).map(
         (item: customHtdflBdst) => {
+          let archArea = item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
+
           return {
             ...item,
+            archArea:archArea
+
           };
         }
       );
       setbdstTable(htdflData);
+    }else{
+      setbdstTable([]);
     }
   }, [code, htdflRes]);
 
@@ -79,7 +89,7 @@ export default function Home() {
   //   setBdstChgProps({ isOpen: true, chgBuilding: chgBuilding });
   // };
   useEffect(() => {
-    getHtdflBdstData(pageNation, "0");
+    getHtdflBdstData(pageNation, "41");
   }, [pageNation]);
 
   return (
@@ -104,7 +114,12 @@ export default function Home() {
                   <Button
                     size={"sm"}
                     onClick={() => {
-                      initHtdfl(searchTxt || "");
+                      if(searchTxt&&searchTxt.length>0){
+                        htdflNmSearch(String(41),searchTxt)
+                      }else{
+                        initHtdflReg(String(41) );
+
+                      }
                     }}
                   >
                     조회
@@ -160,7 +175,8 @@ export default function Home() {
           }}
         />
 
-        {/* <UiModal
+<Toaster position="top-center" />
+{/* <UiModal
           bodyClass={""}
           open={bdstChgProps.isOpen}
           body={
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
index f2875e232..317f68e10 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
@@ -76,7 +76,7 @@ export const hdtflZod = z.object({
     .date()
     .default(() => new Date())
     .nullish(),
-  archArea: z.number().default(0),
+  archArea: z.string().default(''),
   archChgArea: z.number().nullish().default(0),
   rgtr: z.string().nullish().default(null),
   mdfr: z.string().nullish().default(null),
@@ -99,7 +99,8 @@ export type htdflFacState = {
   };
 };
 type htdflFacSActions = {
-  initHtdfl: (code: string) => void;
+  initHtdflReg: (code: string) => void;
+  htdflNmSearch: (code: string | number, fcltNm:string) => void;
   htdflBdstUpdate: (data: customHtdflBdst, code: string | number) => void;
   htdflBdstReg: (data: customHtdflBdst, code: string | number) => void;
   getHtdflBdstData: (pageNation: number, code: string | number) => void;
@@ -116,8 +117,16 @@ export const htdflFacStateExport: htdflFacState = {
   },
 };
 
-const initFetch = async (code: string | number) => {
-  const rswtRes = await getFetch("wr", `/drain/facilityList/1/20/${code}`);
+const initFetch = async (code: string) => {
+
+
+  console.log(' initFetch code ', code)
+  let url = `/drain/facilityList/1/20` 
+    
+    url+=`/${code}`
+
+
+  const rswtRes = await getFetch("wr", url);
   return rswtRes;
 };
 export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
@@ -142,9 +151,9 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         console.log(e);
       }
     },
-    initHtdfl: async (code: string) => {
+    initHtdflReg: async (code: string) => {
       try {
-        const htdflRes = await initFetch(code);
+        const htdflRes = await initFetch( String(code));
         set((state: htdflFacState) => {
           return {
             ...state,
@@ -162,17 +171,18 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
     htdflBdstUpdate: async (data: customHtdflBdst, code: string | number) => {
       try {
 
-        console.log('data ', data)
 
         const chData = await makeMdfr(data);
-        console.log('chData ', chData)
-
         const res = await putFectch("/drain/facility", chData);
-        if (res.ok) {
+
+        if (res.status) {
           toast.success("온배수 건축물 수정이 완료되었습니다.");
         }
 
-        const htdflRes = await initFetch(code);
+        const htdflRes = await getFetch(
+          "wr",
+          `/drain/facilityList/1/20/${code}`
+        );
         set((state: htdflFacState) => ({
           ...state,
           htdfl: {
@@ -195,7 +205,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         if (res.status ===200) {
             toast.success("온배수 건축물 등록이 완료되었습니다.");
         }
-        const htdflRes = await initFetch(code);
+        const htdflRes = await initFetch(String(code));
         set((state: htdflFacState) => ({
           ...state,
           htdfl: {
@@ -208,6 +218,23 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         toast.error("온배수 건축물 등록 오류입니다..");
 
       }
-    }
+    },htdflNmSearch :async(code:string | number, fcltNm:string) =>{
+      try {
+
+        const htdflRes = await getFetch("wr", `/drain/facilityList/1/20/${code}/${fcltNm}`);
+        set((state: htdflFacState) => {
+          return {
+            ...state,
+            htdfl: {
+              ...state.htdfl,
+              htdflRes: htdflRes,
+              isInit: false,
+            },
+          };
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    },
   };
 };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
index 178badd3b..df9c3b543 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
@@ -11,7 +11,7 @@ import { makeMdfr, makeRstr } from "../bdstReg";
   wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
   oblgTrgtWtrUsqty: z.number().nullish().default(0),
   orgwtKndCd: z.string({ required_error: validationMessages.requiredSelect("원수 종류") }).min(1, { message: validationMessages.requiredSelect("원수 종류") }),
-  filtrTrtmfctCpct: z.number({ required_error: validationMessages.required("처리시설 용량") }).positive({ message: validationMessages.required("처리시설 용량") }),
+  filtrTrtmfctCpct: z.number({ required_error: validationMessages.required("처리시설 용량") }),
   filtrTrtmfctProcs: z.string({ required_error: validationMessages.required("주요처리공정") }).min(1, { message: validationMessages.required("주요처리공정") }),
   filtrTrtmfctUsgCd: z.string().default("").nullish(),
   rswtrUsqty: z.number().default(0),
diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
index 8ae9ad4dd..04b36cbc5 100644
--- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
+++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
@@ -89,7 +89,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
 
   return (
     <>
-      <h1 className={formH1Class}>건축물 기본 정보</h1>
+      <h1 className={formH1Class}> {  type !== "HTB"?"건축물 기본 정보": '발전소 기본 정보'}</h1>
       <div className="grid grid-cols-6 gap-2 mt-4">
         <div className="col-span-3">
           <FormField
@@ -140,10 +140,10 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="bdstNm"
             render={({ field }) => (
-              <FormUi label="건축물명">
+              <FormUi label={  type !== "HTB"?"건축물명": '발전소명'}>
                 <Input
                   className={selectClass}
-                  placeholder="건축물 명 입력하세요"
+                  placeholder= {type !== "HTB"?"건축물 명 입력하세요":'발전소명 입력하세요' }
                   type="text"
                   {...field}
                 />
@@ -156,7 +156,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="daddr"
             render={({ field }) => (
-              <FormUi label="건축물 주소">
+              <FormUi label= {  type !== "HTB"?"건축물 주소": '발전소 주소'} >
                 <Input
                   className={selectClass}
                   placeholder="위치를 입력해주세요"
@@ -173,7 +173,7 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
             control={form.control}
             name="frstArchPrmsnDt"
             render={({ field }) => (
-              <FormUi label="최초건축허가일">
+              <FormUi label= {  type !== "HTB"?"최초건축허가일": '준공년도'} >
                 <DatePicker
                   mode={"single"}
                   field={{
diff --git a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
index 5547f057b..83051672d 100644
--- a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
@@ -58,8 +58,6 @@ export default function HtdflRegForm({
       if (setIsModal) setIsModal(false);
     } else {
 
-      console.log(' isModal  ' ,isModal)
-      console.log(' values  ' ,values)
       htdflBdstUpdate(values, "41");
     }
   };
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
index ed0e51af6..8c71d77a9 100644
--- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
@@ -62,7 +62,11 @@ export default function RswtrRegForm({
       rswtBdstUpdate(values, "41");
     }
   };
-  const cleanRswtData = (raw: any): z.infer<typeof rswtZod> => {
+
+  const filtrTrtmfctCpct = form.watch('reuseBuilding.0.rswtrObj.filtrTrtmfctCpct')
+   const cleanRswtData = (raw: any): z.infer<typeof rswtZod> => {
+
+    console.log('raw ', raw)
     return {
       ...raw,
       frstArchPrmsnDt: raw?.frstArchPrmsnDt
@@ -82,11 +86,20 @@ export default function RswtrRegForm({
         rswtrObj: {
           ...item?.rswtrObj,
           filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
+          filtrTrtmfctCpct: item?.rswtrObj?.filtrTrtmfctCpct ?? null,
+          filtrTrtmfctProcs: item?.rswtrObj?.filtrTrtmfctProcs || code.rswtPrscCdMthdCd[0]?.val,
+          orgwtKndCd: item?.rswtrObj?.orgwtKndCd || code.orgwtKndCd[0]?.val,
         },
       })),
     };
   };
-
+  // useEffect(() =>{
+  //   console.log(' formform ', form.watch())
+  // },[form.formState])
+  useEffect(() =>{
+    console.log(' filtrTrtmfctCpct ', filtrTrtmfctCpct)
+  },[filtrTrtmfctCpct])
+  
   useEffect(() => {
     console.log("form errors:", form.formState.errors);
   }, [form.formState.errors]);
@@ -227,6 +240,8 @@ export default function RswtrRegForm({
                         onFocus={() => {
                           // 입력 시 자동으로 확인불가 해제
                           if (isUnknown && !readonly) {
+
+                          console.log('value')
                             field.onChange(""); // 초기화
                           }
                         }}
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index bee445114..4abe29d4e 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -148,7 +148,7 @@ export function BdstReg<T extends MoType>({ moType,setIsModal,isModal }: BdstReg
               <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={isModal} setIsModal={setIsModal} />
             :moType==='RST' 
               ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={isModal} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
-               :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true} setIsModal={(open) =>{setIsModal}}></HtdflRegForm>
+               :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true} setIsModal={(open) =>{setIsModal && setIsModal(open)}}></HtdflRegForm>
             }
               
           </div>

From 76a511a5e0bdef23705be53a9467498d8be697b5 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Fri, 4 Jul 2025 20:06:07 +0900
Subject: [PATCH 32/44] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/rainReg/page.tsx   |  3 +++
 .../app/ruseFcltMng/fcltReg/rswtReg/page.tsx   | 18 ++++++++++++++++--
 .../ui/form/fcltReg/bdstReg/bdstReg.tsx        |  4 ++--
 .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx  | 14 +++++++-------
 .../fcltReg/bdstRegModal/bdstRegModal.tsx      |  2 +-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
index b468fad03..8ecc1221f 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rainReg/page.tsx
@@ -51,8 +51,11 @@ export default function Home() {
     if (code.sggCd.length > 0) {
       const rainData = tableData(rainRes, { code }).map(
         (item: customRainBdst) => {
+          let archArea = item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
           return {
             ...item,
+              archArea:archArea,
+          
             bdstChgYn: item.chgBuilding.length > 0 ? "Y" : "N",
           };
         }
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
index ea0dea649..94224d40d 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
@@ -20,6 +20,7 @@ import {
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components";
 import { useEffect, useState } from "react";
+import { Toaster } from "react-hot-toast";
 
 export default function Home() {
   const { code, rswt, initRswt, rswtBdstSearch, getRswtBdstData } = useWrStore(
@@ -45,8 +46,13 @@ export default function Home() {
     if (code.sggCd.length > 0 && rswtRes?.length > 0) {
       const rswtData = tableData(rswtRes, { code })?.map(
         (item: customRswtBdst) => {
+          let archArea =
+            item?.archArea.split(".")[0] !== "-1"
+              ? item?.archArea.split(".")[0]
+              : "확인불가";
           return {
             ...item,
+            archArea: archArea,
             bdstChgYn: item.chgBuilding[0]?.bdstChgNm != null ? "Y" : "N",
             bdstUsgCd: item.reuseBuilding[0]?.bdstUsgCd,
           };
@@ -151,7 +157,13 @@ export default function Home() {
         </div>
 
         <UiModal
-          body={<BdstReg moType="RST" setIsModal={setIsNewReg} isModal={issNewReg}></BdstReg>}
+          body={
+            <BdstReg
+              moType="RST"
+              setIsModal={setIsNewReg}
+              isModal={issNewReg}
+            ></BdstReg>
+          }
           bodyClass="w-[68vw] max-w-none h-[90vh]"
           open={issNewReg}
           onOpenChange={(open) => {
@@ -162,12 +174,14 @@ export default function Home() {
           bodyClass={""}
           open={bdstChgProps.isOpen}
           body={
-            <BdstChgModal chgBuilding={bdstChgProps.chgBuilding} ></BdstChgModal>
+            <BdstChgModal chgBuilding={bdstChgProps.chgBuilding}></BdstChgModal>
           }
           onOpenChange={(open) => {
             setBdstChgProps({ ...bdstChgProps, isOpen: open });
           }}
         />
+
+        <Toaster position="top-center" />
       </ContentsDiv>
     </>
   );
diff --git a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
index 04b36cbc5..31e8dbacb 100644
--- a/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
+++ b/apps/wr/components/ui/form/fcltReg/bdstReg/bdstReg.tsx
@@ -223,9 +223,9 @@ export default function BdstReg({ form, type }: { form: any; type?: string }) {
                       placeholder="면적을 입력하세요"
                       type="text"
                       onChange={(e) => {
-                        handleCommaNumberChange(e, field.onChange);
+                      field.onChange(e.target.value)
                       }}
-                      value={formatCommaNumber(field.value)}
+                      value={field.value}
                     />
                   </FormUi>
                 )}
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
index 8c71d77a9..0fbffbf59 100644
--- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
@@ -81,11 +81,11 @@ export default function RswtrRegForm({
           ? new Date(item.instlCmptnDt)
           : new Date(), // item?.instlCmptnDt가 유효하지 않으면 현재 날짜로 초기화
         operMngCd: item?.operMngCd ?? "", // null → ""
-        instlCstSprtYn: item?.instlCstSprtYn ?? "Y", // null → "Y"
-        grntchBdstCertYn: item?.grntchBdstCertYn ?? "Y",
+        instlCstSprtYn: item?.instlCstSprtYn || code.yn[0]?.val, // null → "Y"
+        grntchBdstCertYn: item?.grntchBdstCertYn|| code.yn[0]?.val,
         rswtrObj: {
           ...item?.rswtrObj,
-          filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
+          filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn || code.yn[0]?.val,
           filtrTrtmfctCpct: item?.rswtrObj?.filtrTrtmfctCpct ?? null,
           filtrTrtmfctProcs: item?.rswtrObj?.filtrTrtmfctProcs || code.rswtPrscCdMthdCd[0]?.val,
           orgwtKndCd: item?.rswtrObj?.orgwtKndCd || code.orgwtKndCd[0]?.val,
@@ -349,7 +349,7 @@ export default function RswtrRegForm({
                           if (readonly) return;
                           handleMinusNumberChange(e, field.onChange);
                         }}
-                        disabled={instlCstSprtYn !== "Y"}
+                        disabled={instlCstSprtYn === "N"||instlCstSprtYn === "D"}
                       />
                     </FormUi>
                   );
@@ -374,7 +374,7 @@ export default function RswtrRegForm({
                       label={""}
                       selectArray={code.bdstIncenYn}
                       onSelectValue={readonly ? () => {} : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      value={field.value || code.yn[0]?.val}
                       readOnly={readonly}
                     />
                   </FormUi>
@@ -410,7 +410,7 @@ export default function RswtrRegForm({
                           field.onChange(e.target.value);
                         }
                       }}
-                      disabled={grntchBdstCertYn !== "Y"}
+                      disabled={grntchBdstCertYn == "N" || grntchBdstCertYn == "D"}
                       max={4}
                     />
                   </FormUi>
@@ -447,7 +447,7 @@ export default function RswtrRegForm({
                           field.onChange(e.target.value);
                         }
                       }}
-                      disabled={grntchBdstCertYn !== "Y"}
+                      disabled={grntchBdstCertYn == "N" || grntchBdstCertYn == "D"}
                 
 
 
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index 4abe29d4e..c534c38af 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -147,7 +147,7 @@ export function BdstReg<T extends MoType>({ moType,setIsModal,isModal }: BdstReg
             { moType === 'RNB'?
               <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={isModal} setIsModal={setIsModal} />
             :moType==='RST' 
-              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={isModal} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
+              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={isModal} setIsModal={(open) =>{setIsModal && setIsModal(open)}}></RswtrRegForm>
                :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true} setIsModal={(open) =>{setIsModal && setIsModal(open)}}></HtdflRegForm>
             }
               

From 1d9111ee4c98291f7f7fd8329b6a92e62e2949d6 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Fri, 4 Jul 2025 20:10:52 +0900
Subject: [PATCH 33/44] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98?=
 =?UTF-8?q?=EB=8F=84/=EC=98=A8=EB=B0=B0=EC=88=98=EC=8B=9C=EC=84=A4?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC,=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/fcltSttn/htdflSttn/page.tsx   | 195 ++++++++++++------
 .../ruseFcltMng/fcltSttn/rainSttn/page.tsx    |  86 +++-----
 .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx    | 178 +++++++++++-----
 .../ruseFcltMng/fcltSttn/htdflSttn/index.tsx  |  41 +++-
 .../ruseFcltMng/fcltSttn/rainSttn/index.tsx   |  99 +++++----
 .../ruseFcltMng/fcltSttn/rswtSttn/index.tsx   |  28 ++-
 6 files changed, 385 insertions(+), 242 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
index e43d5b04f..959367202 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
@@ -8,6 +8,7 @@ import type {
 } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import {
   excelDownload,
+  getCity,
   getCityOrSgg,
   tableData,
 } from "@/components/lib/func/commom";
@@ -16,16 +17,23 @@ import SttnDetailModal from "@/components/ui/modal/sttn/sttnDetailModal/sttnDeta
 import {
   ContentsDiv,
   SearchBaseForm,
+  SearchDiv,
+  SearchFormLeft,
+  SearchFormRight,
+  SearchInput,
+  SelectBox,
   Title,
   UiModal,
   UiTable,
   type ReturnType,
+  type SelectDataType,
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
-import { Button } from "@common/components/ui";
+import { Button, Label } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { excelHtdflSttnParsing } from "@/app/store/ruseFcltMng/fcltSttn/htdflSttn/excel";
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
+import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal";
 
 export default function HtdflSttn() {
   const { code, htdflSttn, htdflSttnSearch, initHtdfl } = useWrStore(
@@ -38,6 +46,8 @@ export default function HtdflSttn() {
   const [pageNation, setPageNation] = useState(1);
   const [isChHead, setIsChHead] = useState(false);
   const [bdstTable, setBdstTable] = useState<customRainBdst[]>();
+  const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
+  const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
   const [detailModal, setDetailModal] = useState<{
     isOpen: boolean;
     data: customRainBdst | undefined;
@@ -46,17 +56,47 @@ export default function HtdflSttn() {
     isOpen: boolean;
     chBuilding: chgBuilding[];
   }>({ isOpen: false, chBuilding: [] });
-
-  const codeData = getCityOrSgg(ref);
+  const [fcltNm, setFcltNm] = useState<string>("");
 
   const excelClick = useCallback(() => {
-    if (codeData) htdflSttnSearch(1, "10000", codeData);
-  }, [htdflSttnSearch, codeData]);
+    // 최신 검색 조건 반영
+    const con = getConValue();
+    htdflSttnSearch(1, "10000", String(con), fcltNm, code.cityCd, code.sggCd);
+  }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   useEffect(() => {
-    if (codeData != null) htdflSttnSearch(pageNation, "20", codeData);
+    htdflSttnSearch(pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
   }, [pageNation]);
 
+  const getSelCity = (val: string | number) => {
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      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) })
+  };
+
+  const getConValue = () => {
+    if (!objSearch.city || objSearch.city === "0") {
+      return "0";
+    }
+    if (objSearch.sgg && objSearch.sgg !== "0") {
+      return objSearch.sgg;
+    }
+    return objSearch.city;
+  };
+
   const cellClick = (index: number | undefined, headId: string) => {
     if (
       headId !== "chBuildingYn" &&
@@ -67,42 +107,34 @@ export default function HtdflSttn() {
     }
   };
   useEffect(() => {
-    const excelDown = async () => {
-      if (htdflSttn.excelList.length > 0) {
-        if (htdflSttn.excelList.length === 0) return;
-        const excelData = await tableData(htdflSttn.excelList, { code });
-        const htdflExcel = excelHtdflSttnParsing(excelData, code.cityCd, code.sggCd);
-        excelDownload(
-          htdflExcel as [[]],
-          "온배수시설 현황",
-          "sample_htdflSttn.xlsx",
-          "A1:S3"
-        );
-      }
-    };
-    excelDown();
+    if (htdflSttn.excelList.length > 0) {
+      if (htdflSttn.excelList.length === 0) return;
+      excelDownload(
+        htdflSttn.excelList,
+        "온배수시설 현황",
+        "sample_htdflSttn.xlsx",
+        "A1:S3"
+      );
+    }
   }, [htdflSttn.excelList, code]);
 
   useEffect(() => {
     if (!htdflSttn.isInit) {
-      initHtdfl(codeData ?? "0");
+      initHtdfl(1, "20", "0", fcltNm, code.cityCd, code.sggCd);
     }
   }, [htdflSttn.isInit, initHtdfl]);
 
   useEffect(() => {
-    if (htdflSttnRes.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(htdflSttnRes, { code });
-      const chData = data
-        .map((item: any) => ({
-          ...item,
-          ...item.reuseBuilding[0],
-          ...item.reuseBuilding[0].htdflObj,
-          chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N",
-        }))
-        .filter((item: any) => item.htdflObj !== undefined);
-
-      setBdstTable(chData);
-    }
+    const data = tableData(htdflSttnRes, { code });
+    const chData = data
+      .map((item: any) => ({
+        ...item,
+        ...item.reuseBuilding[0],
+        ...item.reuseBuilding[0].htdflObj,
+        chBuildingYn: item.chgBuilding[0]?.bdstChgNm !== null ? "Y" : "N",
+      }))
+      .filter((item: any) => item.htdflObj !== undefined);
+    setBdstTable(chData);
   }, [code, htdflSttnRes, htdflSttn.htdflSttHeadList]);
 
   return (
@@ -111,43 +143,76 @@ export default function HtdflSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"온배수 시설 현황"} />
-            <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={<Button
-                className={btnClass}
-                onClick={() => {
-                  setIsChHead(true);
-                } }
-              >
-                조회항목설정
-              </Button>}
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                let con;
-                if (returnType.sigunValue != "0") {
-                  con = returnType.sigunValue;
-                } else {
-                  con = returnType.sidoValue;
-                }
-                 htdflSttnSearch(pageNation, "20", con);
-              } }
-              excelClick={excelClick}
-              initClick={function (): void { } }
-              btnClass={btnClass}
-              ref={ref} isAdmin={false}            />
+
+            <SearchDiv>
+              <SearchFormLeft>
+                <div className="col-span-10 flex flex-row">
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl"
+                    label="시도"
+                    selectClass={""}
+                    selectArray={code.cityCd}
+                    onSelectValue={getSelCity}
+                  />
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl ml-4"
+                    label="시군구"
+                    selectClass={""}
+                    selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
+                    onSelectValue={getSgg}
+                  />
+                  <div className="col-span-2 flex flex-row space-x-2">
+                    <Label className="w-28 mt-2 text-xl text-gray-600">
+                      {"시설명"}
+                    </Label>
+                    <SearchInput
+                      className={"w-full h-full text-2xl"}
+                      label={""}
+                      textValue={fcltNm || ""}
+                      setText={setFcltNm}
+                    />
+                  </div>
+                </div>
+              </SearchFormLeft>
+              <SearchFormRight
+                className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
+                    size={"sm"}
+                    onClick={() => {
+                      const con = getConValue();
+                      htdflSttnSearch(pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={`${btnClass} green`}
+                    onClick={excelClick}
+                  >
+                    다운로드
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={btnClass}
+                    onClick={() => {
+                      setIsChHead(true);
+                    }}
+                  >
+                    조회항목설정
+                  </Button>
+                </div>
+              </SearchFormRight>
+            </SearchDiv>
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
           <div className="col-span-6">
             <ListDiv>
               <UiTable
-                headName={[]}
+                headName={undefined}
                 tableData={bdstTable || []}
                 children={
                   <HeadMakeColSpan upHeadList={htdflSttn.htdflSttNodeList} />
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
index 7e068bcd0..0b6dffe07 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
@@ -24,7 +24,7 @@ import {
   type SelectDataType,
 } from "@common/business_components/ui";
 import ListDiv from "@common/business_components/ui/list_div";
-import { Button } from "@common/components/ui";
+import { Button, Label } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import type {
   chgBuilding,
@@ -52,8 +52,7 @@ export default function RainSttn() {
     isOpen: boolean;
     chBuilding: chgBuilding[];
   }>({ isOpen: false, chBuilding: [] });
-
-  const codeData = getCityOrSgg(ref);
+  const [fcltNm, setFcltNm] = useState<string>("");
 
   const cellClick = (index: number | undefined, headId: string) => {
 
@@ -82,7 +81,6 @@ export default function RainSttn() {
   };
 
   const getSgg = (val: string | number) => {
-    console.log("val", val)
     setObjSearch({ ...objSearch, sgg: String(val) })
   };
 
@@ -96,11 +94,9 @@ export default function RainSttn() {
     return objSearch.city;
   };
 
-
-
   useEffect(() => {
     if (!rainSttn.isInit) {
-      rainSttnInit(codeData ?? "0");
+      rainSttnInit(1, "20", "0", fcltNm, code.cityCd, code.sggCd);
     }
   }, [rainSttn.isInit, rainSttnInit]);
 
@@ -108,8 +104,6 @@ export default function RainSttn() {
     const data = tableData(rainSttnRes, { code });
     const chData = data
       .map((item: any) => {
-        console.log("item", item);
-        console.log("왜안돼", item.reuseBuilding[0].rainyObj.dtfcltCpct)
         return {
           ...item,
           ...item.reuseBuilding[0],
@@ -124,15 +118,21 @@ export default function RainSttn() {
             ? "확인불가"
             : 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,
         };
       })
       .filter((item: any) => item.rainyObj !== undefined);
-    console.log("chData", chData)
     setBdstTable(chData);
   }, [code, rainSttnRes, rainSttn.rainSttHeadList]);
 
   useEffect(() => {
-    if (codeData != null) rainSttnSearch(pageNation, "20", codeData, code.cityCd, code.sggCd);
+    rainSttnSearch(pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
   }, [pageNation]);
 
   useEffect(() => {
@@ -147,13 +147,10 @@ export default function RainSttn() {
     }
   }, [rainSttn.excelList]);
 
-  // const excelClick = useCallback(() => {
-  //   if (codeData) rainSttnSearch(1, "10000", codeData, code.cityCd, code.sggCd);
-  // }, [rainSttnSearch, codeData, code.cityCd, code.sggCd]);
   const excelClick = useCallback(() => {
     // 최신 검색 조건 반영
     const con = getConValue();
-    rainSttnSearch(1, "10000", String(con), code.cityCd, code.sggCd);
+    rainSttnSearch(1, "10000", String(con), fcltNm, code.cityCd, code.sggCd);
   }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   return (
@@ -162,8 +159,6 @@ export default function RainSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"빗물재이용 시설 현황"} />
-
-
             <SearchDiv>
               <SearchFormLeft>
                 <div className="col-span-10 flex flex-row">
@@ -182,6 +177,17 @@ export default function RainSttn() {
                     value={objSearch.sgg} // value props 추가
                     onSelectValue={getSgg}
                   />
+                  <div className="col-span-2 flex flex-row space-x-2">
+                    <Label className="w-28 mt-2 text-xl text-gray-600">
+                      {"시설명"}
+                    </Label>
+                    <SearchInput
+                      className={"w-full h-full text-2xl"}
+                      label={""}
+                      textValue={fcltNm || ""}
+                      setText={setFcltNm}
+                    />
+                  </div>
                 </div>
               </SearchFormLeft>
               <SearchFormRight
@@ -191,7 +197,7 @@ export default function RainSttn() {
                     size={"sm"}
                     onClick={() => {
                       const con = getConValue();
-                      rainSttnSearch(1, "20", String(con), code.cityCd, code.sggCd);
+                      rainSttnSearch(pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
                     }}
                   >
                     조회
@@ -215,50 +221,6 @@ export default function RainSttn() {
                 </div>
               </SearchFormRight>
             </SearchDiv>
-
-
-
-
-
-
-
-
-
-
-            {/* <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={
-                <Button
-                  className={btnClass}
-                  onClick={() => {
-                    setIsChHead(true);
-                  }}
-                >
-                  조회항목설정
-                </Button>
-              }
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                let con;
-                if (returnType.sigunValue != "0") {
-                  con = returnType.sigunValue;
-                } else {
-                  con = returnType.sidoValue;
-                }
-                rainSttnSearch(1, "20", con, code.cityCd, code.sggCd);
-              }}
-              excelClick={excelClick}
-              initClick={function (): void { }}
-              btnClass={btnClass}
-              ref={ref}
-              isAdmin={false}
-            /> */}
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
index f9b3c6187..ee7a344f8 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
@@ -5,23 +5,31 @@ import type { chgBuilding } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import type { customRswtBdst } from "@/app/store/ruseFcltMng/fcltReg/rswtReg";
 import {
   excelDownload,
+  getCity,
   getCityOrSgg,
   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";
 import {
   ContentsDiv,
   SearchBaseForm,
+  SearchDiv,
+  SearchFormLeft,
+  SearchFormRight,
+  SearchInput,
+  SelectBox,
   Title,
   UiModal,
   UiTable,
   type ReturnType,
+  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";
-import { Button } from "@common/components/ui";
+import { Button, Label } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 
 export default function RswtSttn() {
@@ -34,13 +42,14 @@ export default function RswtSttn() {
   const [isChHead, setIsChHead] = useState(false);
   const ref = useRef<ReturnType>({} as ReturnType);
   const [bdstTable, setBdstTable] = useState<customRswtBdst[]>();
+  const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
+  const [objSearch, setObjSearch] = useState<objSearchType>({ sgg: "", city: "" });
   const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRswtBdst | undefined }>({ data: undefined, isOpen: false })
   const [bdstChgProps, setBdstChgProps] = useState<{
     isOpen: boolean;
     chBuilding: chgBuilding[];
   }>({ isOpen: false, chBuilding: [] });
-
-  const codeCityOrSgg = getCityOrSgg(ref);
+  const [fcltNm, setFcltNm] = useState<string>("");
 
   const cellClick = (index: number | undefined, headId: string) => {
 
@@ -50,37 +59,67 @@ export default function RswtSttn() {
       if (
         bdstTable[index] &&
         bdstTable[index]?.chBuildingYn === 'Y'
-
       ) {
-
         setBdstChgProps({ isOpen: true, chBuilding: bdstTable[index].chgBuilding });
       }
     }
   }
 
+  const getSelCity = (val: string | number) => {
+    const cityValue = String(val);
+
+    if (cityValue === "0") {
+      setSelectSgg([]);
+      setObjSearch({ city: cityValue, sgg: "" });
+    } else {
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+
+      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) })
+  };
+
+  const getConValue = () => {
+    if (!objSearch.city || objSearch.city === "0") {
+      return "0";
+    }
+    if (objSearch.sgg && objSearch.sgg !== "0") {
+      return objSearch.sgg;
+    }
+    return objSearch.city;
+  };
+
   useEffect(() => {
     if (!rswtSttn.isInit) {
-      rswtSttnInit("0");
+      rswtSttnInit(1, "20", "0", fcltNm, code.cityCd, code.sggCd);
     }
   }, [rswtSttn.isInit, rswtSttnInit]);
 
   useEffect(() => {
-    if (rswtSttnRes?.length > 0 && code.cityCd.length > 0) {
-      const data = tableData(rswtSttnRes, { code });
-      const chData = data
-        .map((item: customRswtBdst) => ({
+    const data = tableData(rswtSttnRes, { code });
+    const chData = data
+      .map((item: customRswtBdst) => {
+        return {
           ...item,
           ...item.reuseBuilding[0],
           ...item.reuseBuilding[0]?.rswtrObj,
-          chBuildingYn: item?.chgBuilding[0]?.bdstChgNm !== null && item?.chgBuilding.length > 0 ? 'Y' : 'N'
-        }))
-        .filter(
-          (item: customRswtBdst) =>
-            item.reuseBuilding[0]?.rswtrObj !== undefined
-        );
+          chBuildingYn: item?.chgBuilding[0]?.bdstChgNm !== null && item?.chgBuilding.length > 0 ? 'Y' : 'N',
+          instlCst: item.reuseBuilding[0]?.instlCst === -1 ? "확인불가" : item.reuseBuilding[0]?.instlCst,
+          instlCstSprtAmt: item.reuseBuilding[0]?.instlCstSprtAmt === -1 ? "확인불가" : item.reuseBuilding[0]?.instlCstSprtAmt,
+          archArea : item?.archArea.split('.')[0]!=='-1'?item?.archArea.split('.')[0]:'확인불가'
+        }
+      })
+      .filter(
+        (item: customRswtBdst) =>
+          item.reuseBuilding[0]?.rswtrObj !== undefined
+      );
 
-      setBdstTable(chData);
-    }
+    setBdstTable(chData);
   }, [code, rswtSttnRes]);
 
   useEffect(() => {
@@ -95,16 +134,14 @@ export default function RswtSttn() {
     }
   }, [rswtSttn.excelList]);
 
-  const excelClick = useCallback(
-    (returnType: ReturnType) => {
-      if (codeCityOrSgg)
-        rswtSttnSearch(1, "10000", codeCityOrSgg, code.cityCd, code.sggCd);
-    },
-    [rswtSttnSearch, code.cityCd, code.sggCd, codeCityOrSgg]
-  );
+  const excelClick = useCallback(() => {
+    // 최신 검색 조건 반영
+    const con = getConValue();
+    rswtSttnSearch(1, "10000", String(con), fcltNm, code.cityCd, code.sggCd);
+  }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd]);
 
   useEffect(() => {
-    if (codeCityOrSgg != null) rswtSttnSearch(pageNation, "20", codeCityOrSgg, code.cityCd, code.sggCd);
+    rswtSttnSearch(pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
   }, [pageNation]);
 
   return (
@@ -113,38 +150,75 @@ export default function RswtSttn() {
         <div className="grid grid-cols-4 gap-4 ">
           <div className="col-span-4">
             <Title title={"중수도시설 현황"} />
-            <SearchBaseForm
-              selectSidoData={code.cityCd}
-              selectSigunData={code.sggCd}
-              selectRegionData={code.rvbsnCd}
-              selectUnitWaterShedData={code.lgbsnCd}
-              selectMiddleRegionData={code.mdmbsnCd}
-              selectEnvPartData={code.lclgvrnmntCd}
-              rightChildren={<Button
-                className={btnClass}
-                onClick={() => {
-                  setIsChHead(true);
-                } }
-              >
-                조회항목설정
-              </Button>}
-              leftChildren={undefined}
-              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                if (codeCityOrSgg)
-                  rswtSttnSearch(1, "20", codeCityOrSgg, code.cityCd, code.sggCd);
-              } }
-              excelClick={excelClick}
-              initClick={function (): void { } }
-              btnClass={btnClass}
-              ref={ref} isAdmin={false}            />
+            <SearchDiv>
+              <SearchFormLeft>
+                <div className="col-span-10 flex flex-row">
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl"
+                    label="시도"
+                    selectClass={""}
+                    selectArray={code.cityCd}
+                    onSelectValue={getSelCity}
+                  />
+                  <SelectBox
+                    className="col-span-2 w-1/6 h-full text-2xl ml-4"
+                    label="시군구"
+                    selectClass={""}
+                    selectArray={selectSgg || []}
+                    value={objSearch.sgg} // value props 추가
+                    onSelectValue={getSgg}
+                  />
+                  <div className="col-span-2 flex flex-row space-x-2">
+                    <Label className="w-28 mt-2 text-xl text-gray-600">
+                      {"시설명"}
+                    </Label>
+                    <SearchInput
+                      className={"w-full h-full text-2xl"}
+                      label={""}
+                      textValue={fcltNm || ""}
+                      setText={setFcltNm}
+                    />
+                  </div>
+                </div>
+              </SearchFormLeft>
+              <SearchFormRight
+                className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
+                <div className="flex flex-row space-x-2 items-center">
+                  <Button
+                    size={"sm"}
+                    onClick={() => {
+                      const con = getConValue();
+                      rswtSttnSearch(pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
+                    }}
+                  >
+                    조회
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={`${btnClass} green`}
+                    onClick={excelClick}
+                  >
+                    다운로드
+                  </Button>
+                  <Button
+                    size={"sm"}
+                    className={btnClass}
+                    onClick={() => {
+                      setIsChHead(true);
+                    }}
+                  >
+                    조회항목설정
+                  </Button>
+                </div>
+              </SearchFormRight>
+            </SearchDiv>
           </div>
         </div>
         <div className="grid grid-cols-6 gap-4 ">
           <div className="col-span-6">
             <ListDiv>
               <UiTable
-                headName={[]}
+                headName={undefined}
                 tableData={bdstTable || []}
                 children={
                   <HeadMakeColSpan upHeadList={rswtSttn.rswtSttNodeList} />
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
index dccc8719c..eb37d0d73 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/htdflSttn/index.tsx
@@ -5,6 +5,7 @@ import type { z } from "zod";
 import { controlHeadView } from "../rainSttn";
 import type { customHtdflBdst } from "../../fcltReg/htdflReg";
 import { fetchType, getFetch } from "@/components/lib/api";
+import type { SelectDataType } from "@common/business_components/ui";
 
 const htdflSttHeadList = htdflSttHeadListExport;
 const htdflSttNodeList = htdflSttNodeListExport;
@@ -20,8 +21,12 @@ export type htdflSttnState = {
   };
 };
 type htdflSttnActions = {
-  initHtdfl: (con: string) => void;
-  htdflSttnSearch: (page: number, total: string, con: string) => void;
+  initHtdfl: (page: number, total: string, con: string, txt: string,
+        sidoCode: SelectDataType[],
+        sggCode: SelectDataType[]) => void;
+  htdflSttnSearch: (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => void;
   htdflChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
@@ -38,10 +43,17 @@ export const htdflSttnStateExport: htdflSttnState = {
     isInit: false,
   },
 };
-const initFetch = async (code: string | number) => {
+const initFetch = async (page: number, total: string, con: string, txt: string,
+  sidoCode: SelectDataType[],
+  sggCode: SelectDataType[]) => {
   const htdflRes = await getFetch(
     "wr",
-    `/drain/facilityList/1/20/${code}`)
+    `/drain/facilityList` +
+    (page ? `/${page}` : "/1") +
+    (total ? `/${total}` : "/20") +
+    (con ? `/${con}` : "/0") +
+    (txt ? `/${txt}` : "")
+  );
 
   return htdflRes;
 };
@@ -50,9 +62,11 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
   set: any
 ) => {
   return {
-    initHtdfl: async (code: string | number) => {
+    initHtdfl: async (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
       try {
-        const htdflSttnRes = await initFetch(code);
+        const htdflSttnRes = await initFetch(page, total, con, txt, sidoCode, sggCode);
         set((state: htdflSttnState) => {
           return {
             ...state,
@@ -67,17 +81,22 @@ export const htdflSttnActionsExport: (set: any) => htdflSttnActions = (
         console.log(error);
       }
     },
-    htdflSttnSearch: async (page: number, total: string, con: string) => {
+    htdflSttnSearch: async (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
       try {
+        console.log("page", page)
         const htdflSttnRes = await getFetch(
           fetchType.WR,
-          `/drain/facilityList/${page}/${total}/${con}`
+          `/drain/facilityList` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
+
         if (Number(total) > 9000) {
-
-
           set((state: htdflSttnState) => {
-
             return {
               ...state,
               htdflSttn: {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
index 42d158d4e..eb2c08d37 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rainSttn/index.tsx
@@ -1,4 +1,4 @@
-import type {  rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
+import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import { fetchType, getFetch } from "@/components/lib/api";
 import {
   type customRainBdst,
@@ -16,34 +16,34 @@ import type { CommonTableProps } from "@/app/store/common/type/header";
 import type { SelectDataType } from "@common/business_components/ui";
 
 // 테이블 헤드 리스트
-const rainSttHeadList = rainSttHeadListExport; 
+const rainSttHeadList = rainSttHeadListExport;
 const rainSttNodeList = rainSttNodeListExport;
 const rainSttnDetailNodeList = rainSttnDetailNodeListExport;
 const rainSttnDetailHeadList = rainSttnDetailHeadListExport;
 
 const rainSttnRes: customRainBdst[] = [];
-const rainChkRes : rainChkZodType ={} as rainChkZodType
+const rainChkRes: rainChkZodType = {} as rainChkZodType
 
 
-const visibleHeadList = (falseHeads:CommonTableProps[], orgNodeList:CommonTableProps[])=>{
+const visibleHeadList = (falseHeads: CommonTableProps[], orgNodeList: CommonTableProps[]) => {
   const visibleHeads = orgNodeList.map((node) => {
-    const copyNode = {...node}
-    falseHeads.forEach((head)=>{
-          if(copyNode.id ===head.id)
-            copyNode.visible = head.visible
+    const copyNode = { ...node }
+    falseHeads.forEach((head) => {
+      if (copyNode.id === head.id)
+        copyNode.visible = head.visible
     })
     return copyNode;
   })
   return visibleHeads
 }
 
-const getColspanReductionMap = (falseHeads:CommonTableProps[], orgList:CommonTableProps[]):Record<string, number>  => {
-  const reduceMap:Record<string, number>  = {};
+const getColspanReductionMap = (falseHeads: CommonTableProps[], orgList: CommonTableProps[]): Record<string, number> => {
+  const reduceMap: Record<string, number> = {};
   falseHeads.forEach(head => {
     const node = orgList.find(n => n.id === head.id);
     if (node?.upName) {
       reduceMap[node.upName] = (reduceMap[node.upName] || 0) + 1;
-      if (node.row&& node.row >= 3) {
+      if (node.row && node.row >= 3) {
         const upperUpName = orgList.find(n => n.id === node.upName)?.upName;
         if (upperUpName) {
           reduceMap[upperUpName] = (reduceMap[upperUpName] || 0) + 1;
@@ -78,35 +78,37 @@ const applyColspanReduction = (
   });
 };
 // 일단 헤더가 3개 이상인경우 visible 처리를 위해서 공통함수로 작업
-export const controlHeadView = (headList:CommonTableProps[], orgNodeList:CommonTableProps[] ) =>{
+export const controlHeadView = (headList: CommonTableProps[], orgNodeList: CommonTableProps[]) => {
   const falseHeads = headList.filter((item) => item.visible == false);
 
   const viewHeadList = visibleHeadList(falseHeads, orgNodeList)
-  const reduceMap=  getColspanReductionMap( falseHeads,viewHeadList)
-  return applyColspanReduction(viewHeadList,reduceMap);
+  const reduceMap = getColspanReductionMap(falseHeads, viewHeadList)
+  return applyColspanReduction(viewHeadList, reduceMap);
 }
 
-
-
 export type rainSttnState = {
   rainSttn: {
     rainSttnRes: customRainBdst[];
     rainSttHeadList: CommonTableProps[];
     rainSttNodeList: CommonTableProps[];
-    rainSttnDetailHeadList:CommonTableProps[]
-    rainSttnDetailNodeList:CommonTableProps[]
-    rainChkRes:rainChkZodType
+    rainSttnDetailHeadList: CommonTableProps[]
+    rainSttnDetailNodeList: CommonTableProps[]
+    rainChkRes: rainChkZodType
     excelList: [];
     isInit: boolean;
   };
 };
 type rainSttnActions = {
-  rainSttnInit:(con:string) => void
-  rainSttnSearch: (page: number, total: string, con: string, sidoCode: SelectDataType[], sggCode: SelectDataType[]) => void;
+  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;
   rainChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
-  rainSttnChkSearch:(rusePk:string) => void;
+  rainSttnChkSearch: (rusePk: string) => void;
 };
 
 export type rainSttnType = rainSttnState & rainSttnActions;
@@ -115,10 +117,10 @@ export const rainSttnStateExport: rainSttnState = {
   rainSttn: {
     rainSttHeadList: rainSttHeadList,
     rainSttNodeList: rainSttNodeList,
-    rainSttnDetailHeadList:rainSttnDetailHeadList,
-    rainSttnDetailNodeList:rainSttnDetailNodeList,
+    rainSttnDetailHeadList: rainSttnDetailHeadList,
+    rainSttnDetailNodeList: rainSttnDetailNodeList,
     rainSttnRes: rainSttnRes,
-    rainChkRes:rainChkRes,
+    rainChkRes: rainChkRes,
     excelList: [],
     isInit: false,
   },
@@ -128,12 +130,18 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
   set: any
 ) => {
   return {
-    rainSttnInit:  async( con:string)=>{
-      try{
+    rainSttnInit: async (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
+      try {
 
-        const rainSttnRes =   await getFetch(
+        const rainSttnRes = await getFetch(
           fetchType.WR,
-          `/reuseFc/rainyInfoList/1/20/${con}`
+          `/reuseFc/rainyInfoList` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
         set((state: rainSttnState) => {
           return {
@@ -145,21 +153,22 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
             },
           };
         });
-      }catch(e){
+      } catch (e) {
         console.log(e)
       }
     },
-    rainSttnSearch: async (page: number, total: string, con: string,
-          sidoCode: SelectDataType[],
-          sggCode: SelectDataType[]) => {
+    rainSttnSearch: async (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
       try {
-        let a = `/reuseFc/rainyInfoList/${page}/${total}/${con}`
-        console.log("주소", a)
         const rainSttnRes = await getFetch(
           fetchType.WR,
-          `/reuseFc/rainyInfoList/${page}/${total}/${con}`
+          `/reuseFc/rainyInfoList` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
-        console.log("rainSttnRes", rainSttnRes)
         if (Number(total) > 9000) {
           const rainExcel = excelRainSttnParsing(rainSttnRes, sidoCode, sggCode);
           set((state: rainSttnState) => {
@@ -189,7 +198,7 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
     rainChSttnHead: async (
       headList: z.infer<typeof sttnHeadListType>
     ) => {
-     const changeNodeList=    controlHeadView(headList,rainSttNodeList)
+      const changeNodeList = controlHeadView(headList, rainSttNodeList)
 
       return set((state: rainSttnState) => ({
         rainSttn: {
@@ -199,21 +208,21 @@ export const rainSttnActionsExport: (set: any) => rainSttnActions = (
         },
       }));
     },
-    rainSttnChkSearch: async(
-      rusePk:string
-    )=>{
+    rainSttnChkSearch: async (
+      rusePk: string
+    ) => {
       const rainChkRes = await getFetch(
         fetchType.WR,
         `/reuseChk/rainy/${rusePk}`
       );
-      
-      return set((state: rainSttnState) =>({
+
+      return set((state: rainSttnState) => ({
         rainSttn: {
           ...state.rainSttn,
-          rainChkRes:rainChkRes
+          rainChkRes: rainChkRes
         },
 
-      })  )
+      }))
     }
 
   };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
index 301cd965e..8fbe2c26d 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltSttn/rswtSttn/index.tsx
@@ -28,9 +28,12 @@ export type rswtSttnState = {
 };
 
 type rswtSttnActions = {
-  rswtSttnInit: (con: string) => void;
-  rswtSttnSearch: (page: number, total: string, con: string, sidoCode: SelectDataType[],
-    sggCode: SelectDataType[]) => void;
+  rswtSttnInit: (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => void;
+  rswtSttnSearch: (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => void;
   rswtChSttnHead: (
     headList: z.infer<typeof sttnHeadListType>,
   ) => void;
@@ -54,12 +57,18 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = (
   set: any
 ) => {
   return {
-    rswtSttnInit: async (con: string) => {
+    rswtSttnInit: async (page: number, total: string, con: string, txt: string,
+      sidoCode: SelectDataType[],
+      sggCode: SelectDataType[]) => {
       try {
 
         const rswtSttnRes = await getFetch(
           fetchType.WR,
-          `/reuseFc/waterreuseFc/1/20/${con}`
+          `/reuseFc/waterreuseFc` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
         set((state: rswtSttnState) => {
           return {
@@ -75,13 +84,18 @@ export const rswtSttnActionsExport: (set: any) => rswtSttnActions = (
         console.log(e)
       }
     },
-    rswtSttnSearch: async (page: number, total: string, con: string,
+    rswtSttnSearch: async (page: number, total: string, con: string, txt: string,
       sidoCode: SelectDataType[],
       sggCode: SelectDataType[]) => {
       try {
+        console.log("헐", page)
         const rswtSttnRes = await getFetch(
           fetchType.WR,
-          `/reuseFc/waterreuseFc/${page}/${total}/${con}`
+          `/reuseFc/waterreuseFc` +
+          (page ? `/${page}` : "/1") +
+          (total ? `/${total}` : "/20") +
+          (con ? `/${con}` : "/0") +
+          (txt ? `/${txt}` : "")
         );
         if (Number(total) > 9000) {
           const rswtExcel = excelRSwtSttnParsing(rswtSttnRes, sidoCode, sggCode);

From db74c07df89d5bea899af9b1379eadc306f6996c Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Fri, 4 Jul 2025 22:26:55 +0900
Subject: [PATCH 34/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/coMatRvw/page.tsx    | 33 ++++---
 .../app/ruseFcltMng/fcltReg/pbnstReg/page.tsx | 90 +++++++++++++------
 .../ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx | 38 ++++++++
 .../prfmncReg/pbnstPrfmncReg/page.tsx         | 39 +++++---
 .../wr/app/store/matDmd/coMatRvw/headList.tsx |  4 +-
 apps/wr/components/lib/func/commom.tsx        | 33 ++++---
 .../ui/form/coMat/conCostForm/conCostForm.tsx | 11 ++-
 .../pbnPrfExcelModal/pbnPrfExcelModal.tsx     | 49 ++++++----
 .../fcltReg/pbnstRegModal/pbnstRegModal.tsx   | 81 ++++++++++++++---
 9 files changed, 282 insertions(+), 96 deletions(-)
 create mode 100644 apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx

diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
index c1e601320..46aeacbf3 100644
--- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
@@ -9,6 +9,7 @@ import {
 } from "@/app/store/matDmd/coMatRvw/type";
 import { formH1Class, formTableName } from "@/components/lib/class/comClass";
 import {
+  formatPhoneNumber,
   getCity,
   getdmdMatFlag,
   tableData,
@@ -33,7 +34,7 @@ import {
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button, Input, Label } from "@common/components/ui";
 import { useEffect, useRef, useState } from "react";
-import { useForm } from "react-hook-form";
+import { useForm, useWatch } from "react-hook-form";
 import toast, { Toaster } from "react-hot-toast";
 import { z } from "zod";
 import moment from "moment";
@@ -68,6 +69,7 @@ export default function CoMatRvw() {
   const [selectData, setSelectData] = useState<DmdCoReqType>(
     {} as DmdCoReqType
   );
+  const [selectionVersion, setSelectionVersion] = useState(0);
 
   const getSearch = (
     startYear: number,
@@ -91,39 +93,46 @@ export default function CoMatRvw() {
 
   const form = useForm<z.infer<typeof DmdCoReqSchema>>({
     resolver: zodResolver(DmdCoReqSchema),
+    shouldUnregister: true
   });
 
+  
   const TableCellClick = (index: number) => {
     console.log(coMatRvwRes);
     if (coMatRvwRes && coMatRvwRes[index]) {
-
       setSelectData(coMatRvwRes[index]);
+      setSelectionVersion((v) => v + 1); // 행을 클릭할 때마다 버전을 1씩 증가
     }
   };
+  const useUsgCdWatch = useWatch({ control: form.control, name: "useUsgCd" });
   useEffect(() => {
-    if (form?.getValues("useUsgCd")) {
+
+    console.log(' useUsgCdWatch page ' ,useUsgCdWatch)
+    if (useUsgCdWatch) {
       form.setValue(
         "demandCst.usgPrcsProcs",
         usageProcData?.find(
-          (item) => item.usage === (form?.getValues("useUsgCd") as string)
+          (item) => item.usage === useUsgCdWatch
         )?.process ?? ""
       );
     }
-  }, [form.watch("useUsgCd")]);
+  }, [useUsgCdWatch, form,selectionVersion]);
 
   useEffect(() => {
     if (coMatRvwRes.length > 0) {
       const data = coMatRvwRes?.map((item, index) => {
         let flag = "";
-          flag = getdmdMatFlag(item?.demandMatching?.splyFcltFlg ??"");
+        
+          flag = getdmdMatFlag(item?.demandMatching?.splyFcltFlg ||undefined);
+
         return {
           ...item,
           ctpvCd: item.demandCo?.ctpvCd,
           sggCd: item.demandCo?.sggCd,
           dmdCoNm: item.demandCo?.dmdCoNm,
           daddr: item.demandCo?.daddr,
-          telno: item.demandCo?.telno,
-          regDt: moment(item?.demandCo?.regDt).format("YYYY-MM-DD"),
+          telno: formatPhoneNumber(item?.demandCo?.telno||''),
+          dmndTmng: item?.dmndTmng,
           splyFcltFlg: flag,
         };
       });
@@ -151,8 +160,8 @@ export default function CoMatRvw() {
 
   useEffect(() => {
     if (selectData) {
-      console.log(selectData);
       form.reset(selectData);
+        setSelectionVersion((v) => v + 1); // 강제로 바뀌었다고 알리기
     }
   }, [selectData, form]);
   return (
@@ -269,7 +278,7 @@ export default function CoMatRvw() {
               ></UiTable>
             </ListDiv>
             <hr />
-            <ScrollArea className="h-[49vh]">
+            {/* <ScrollArea className="h-[49vh]"> */}
               <ListDiv>
                 <h3 className="mt-4 ml-2 text-2xl font-medium text-label">
                   수요신청 상세현황
@@ -660,9 +669,9 @@ export default function CoMatRvw() {
                     </div>
                   </div>
                 </Form>
-                <ConCostForm form={form} type={"mat"} />
+                <ConCostForm form={form} type={"mat"} selectionVersion={selectionVersion} />
               </ListDiv>
-            </ScrollArea>
+            {/* </ScrollArea> */}
           </div>
         </div>
       </ContentsDiv>
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index 174f268d0..8d7e32c66 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -35,6 +35,10 @@ import { useFieldArray, useForm, type FieldErrors } from "react-hook-form"; // F
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
+import { createDefaultPbnstItem } from "./utilsZod";
+
+
+
 export default function PublicReuseFaciltyInsert() {
   const {
     code,
@@ -100,7 +104,7 @@ export default function PublicReuseFaciltyInsert() {
         fcOpers: fclt.fcOpers,
       };
     });
-    await pbnstRuseFcltUpdate(pbnst as customPbnst[]);
+    await  pbnstRuseFcltUpdate(pbnst as customPbnst[])
 
     await pbnstRuseBizUpdate(bizs);
   };
@@ -115,21 +119,43 @@ export default function PublicReuseFaciltyInsert() {
       path: (string | number)[] = []
     ): { message: string; path: (string | number)[] }[] => {
       if (!errorObject) return [];
-
-      return Object.keys(errorObject).flatMap((key) => {
-        const value = errorObject[key];
-        const currentKey = !isNaN(parseInt(key)) ? parseInt(key) : key;
-        const newPath = [...path, currentKey];
-        if (value && typeof value === "object") {
-          if (typeof value.message === "string") {
-            return [{ message: value.message, path: newPath }]; // 에러 메시지와 경로 반환
-          }
-          return findAllErrors(value, newPath);
+    
+      // Zod에서 배열 에러는 바로 배열로 전달됨 (예: items: [ {}, {...}, ... ])
+      if (Array.isArray(errorObject)) {
+        return errorObject.flatMap((entry, index) =>
+          findAllErrors(entry, [...path, index])
+        );
+      }
+    
+      if (typeof errorObject === "object") {
+        const entries: { message: string; path: (string | number)[] }[] = [];
+    
+        if (typeof errorObject.message === "string") {
+          entries.push({ message: errorObject.message, path });
         }
-        return [];
-      });
+    
+        if (Array.isArray(errorObject._errors)) {
+          for (const msg of errorObject._errors) {
+            entries.push({ message: msg, path });
+          }
+        }
+    
+        const keys = Object.keys(errorObject).filter(
+          (k) => k !== "message" && k !== "_errors"
+        );
+    
+        for (const key of keys) {
+          entries.push(...findAllErrors(errorObject[key], [...path, key]));
+        }
+    
+        return entries;
+      }
+    
+      return [];
     };
     const errorList = findAllErrors(errors);
+
+    console.log(' errors ', errors)
     if (errorList.length > 0) {
       errorList.forEach((errorInfo) => {
         const { message, path } = errorInfo;
@@ -160,6 +186,9 @@ export default function PublicReuseFaciltyInsert() {
       });
     }
   };
+  useEffect(() => {
+    console.log("form errors:", form.formState.errors);
+  }, [form.formState.errors]);
 
   useEffect(() => {
     if (code.sggCd.length && pbnstHasuRes.length > 0) {
@@ -184,6 +213,7 @@ export default function PublicReuseFaciltyInsert() {
 
   useEffect(() => {
     if (pbnst.pbnstRes && pbnst.pbnstRes?.length > 0) {
+
       form.reset({ items: pbnstRegArrayZod.parse(pbnst.pbnstRes) });
     } else {
       form.reset({ items: [] });
@@ -204,21 +234,23 @@ export default function PublicReuseFaciltyInsert() {
     if (pbnstRes && pbnstRes.length > 0) {
       const lastPbnst = pbnstRes[pbnstRes.length - 1];
       if (lastPbnst && selecTableRow) {
-        append(
-          pbnstRegZod.parse({
-            pbnstRuseFcltPk:
-              String(selecTableRow.bscFctCd) + String(pbnstRes.length + 1),
-            ruseUtztnFcltNm: "",
-            fcBizs: [
-              fcBizSchema.parse({
-                pbnstRuseFcltFk:
-                  String(lastPbnst.pbnstRuseFcltPk) +
-                  String(pbnstRes.length + 1),
-                cycl: 1,
-              }),
-            ] as fcBizType[],
-          })
-        );
+        // append(
+        //   pbnstRegZod.parse({
+        //     pbnstRuseFcltPk:
+        //       String(selecTableRow.bscFctCd) + String(pbnstRes.length + 1),
+        //     ruseUtztnFcltNm: null,
+        //     fcBizs: [
+        //       fcBizSchema.parse({
+        //         pbnstRuseFcltFk:
+        //           String(lastPbnst.pbnstRuseFcltPk) +
+        //           String(pbnstRes.length + 1),
+        //         cycl: 1,
+        //       }),
+        //     ] as fcBizType[],
+        //   })
+        // );
+        append(createDefaultPbnstItem(selecTableRow, pbnstRes.length));
+
         setIsRuseReg({ isModal: true });
       }
     } else {
@@ -396,7 +428,7 @@ export default function PublicReuseFaciltyInsert() {
                 form={form} // form prop 전달
                 setPbnstInsert={(data) => {
                   if (data) {
-                    pbnstInsert(data); // pbnstInsert 함수 호출
+                   // pbnstInsert(data); // pbnstInsert 함수 호출
                     setIsRuseReg({ isModal: false });
                   }
                 }}
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx
new file mode 100644
index 000000000..14224fce2
--- /dev/null
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx
@@ -0,0 +1,38 @@
+import type { fcBizType, pubHasuType } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
+
+export function createDefaultPbnstItem(
+    selecTableRow: pubHasuType,
+    index: number
+  ) {
+    const pk = String(selecTableRow.bscFctCd) + String(index + 1);
+  
+    return {
+      pbnstRuseFcltPk: pk,
+      swtrmtFcltFk: "",
+      ruseUtztnFcltNm: "", // 필수 입력이므로 빈 문자열로
+      fcltCpct: 0,
+      ruseCpct: 0,
+      splyExtraCpct: 0,
+      regDt: null,
+      rgtr: "test",
+      mdfcnDt: null,
+      mdfr: "test",
+      fcFiles: [],
+      fcBizs: [
+        createDefaultBiz(pk, 1), // 첫 차수
+      ],
+      fcOpers: [],
+    };
+  }
+
+
+  export function createDefaultBiz(
+    pbnstRuseFcltFk: string,
+    cycl: number
+  ): fcBizType {
+    return {
+      pbnstRuseFcltFk,
+      cycl,
+      // 필요한 값 있으면 여기에 추가
+    } as fcBizType;
+  }
\ No newline at end of file
diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
index 10dd7ccb6..f86367a17 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
@@ -37,6 +37,7 @@ import {
   type PrfType,
 } from "@/app/store/prfmncReg/pbnstPrfmncReg/type";
 import { excelToPbnPrfData } from "@/app/store/prfmncReg/pbnstPrfmncReg/excel";
+import data from "@common/components/ui/icon-finder/data";
 
 export default function prfmncPrfmncReg() {
   const { code, prfmnc, prfmncHasuInit, prfmnRegData } = useWrStore(
@@ -78,9 +79,6 @@ export default function prfmncPrfmncReg() {
     }
   }, [inputData, searchYear, pbnstRuseFcltPk, prfmncHasuInit, pageNation]);
 
-
-
-
   const cellClick = useCallback(
     (index: number | undefined, headId: string) => {
       if (index !== undefined) {
@@ -88,16 +86,22 @@ export default function prfmncPrfmncReg() {
           isModal: false,
           data: prfmncRes[index] || ({} as FcPrfType),
         });
-        const inUsageData = structuredClone(initValInUsage).map(row => ({
+        const inUsageData = structuredClone(initValInUsage).map((row) => ({
           ...row,
           구분: "장내용수",
         }));
-        const outUsageData = structuredClone(initValOutUsage).map(row => ({
+        const outUsageData = structuredClone(initValOutUsage).map((row) => ({
           ...row,
           구분: "장외용수",
         }));
-        const inSubtotal = { ...structuredClone(subTotalObj), 구분: "장내용수" };
-        const outSubtotal = { ...structuredClone(subTotalObj), 구분: "장외용수" };
+        const inSubtotal = {
+          ...structuredClone(subTotalObj),
+          구분: "장내용수",
+        };
+        const outSubtotal = {
+          ...structuredClone(subTotalObj),
+          구분: "장외용수",
+        };
         if (prfmncRes[index]?.prfList) {
           prfmncRes[index].prfList?.forEach((prfItem) => {
             const month = Number(prfItem?.ym?.slice(4)); // "MM"
@@ -133,7 +137,11 @@ export default function prfmncPrfmncReg() {
           });
           inUsageData.push(inSubtotal);
           outUsageData.push(outSubtotal);
-          const usageTotalObj: { [key: string]: any } = { ...structuredClone(totalObj), 구분: "총합계", 용수명: "" };
+          const usageTotalObj: { [key: string]: any } = {
+            ...structuredClone(totalObj),
+            구분: "총합계",
+            용수명: "",
+          };
           for (const key in usageTotalObj) {
             if (["usage", "gubun", "edit"].includes(key)) continue;
             const val =
@@ -156,7 +164,7 @@ export default function prfmncPrfmncReg() {
 
   useEffect(() => {
     if (!prfmnc.isInit) {
-      prfmncHasuInit('1', "41");
+      prfmncHasuInit("1", "41");
     }
   }, [prfmnc.isInit, prfmncHasuInit]);
   useEffect(() => {
@@ -203,7 +211,7 @@ export default function prfmncPrfmncReg() {
               <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
                 <div className="space-y">
                   <div className="flex flex-row space-x-2">
-                    <Button size={"sm"} onClick={(e) => { }}>
+                    <Button size={"sm"} onClick={(e) => {}}>
                       조회
                     </Button>
                     <Button
@@ -218,7 +226,7 @@ export default function prfmncPrfmncReg() {
                       size={"sm"}
                       onClick={() => {
                         if (cellNum === undefined) {
-                          toast.error("하수처리재이용시설을 선택해주세요.")
+                          toast.error("하수처리재이용시설을 선택해주세요.");
                           return;
                         } else {
                           setIsExcelOPen({ ...isExcelOpen, isModal: true });
@@ -279,7 +287,14 @@ export default function prfmncPrfmncReg() {
       </ContentsDiv>
       <UiModal
         bodyClass={"w-[30vw] max-w-none"}
-        body={<PbnPrfExcelModal data={isExcelOpen.data}></PbnPrfExcelModal>}
+        body={
+          <PbnPrfExcelModal
+            data={isExcelOpen.data}
+            setIsExcelOPen={(open) => {
+              setIsExcelOPen({ ...isExcelOpen, isModal: open })
+            }}
+          ></PbnPrfExcelModal>
+        }
         open={isExcelOpen.isModal}
         onOpenChange={() => {
           setIsExcelOPen({ isModal: false, data: {} as FcPrfType });
diff --git a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
index 7b43e4b00..6b783ea68 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
@@ -29,12 +29,12 @@ export const coRvwHeadListExport: CommonTableProps[]= [
     visible: true,
   },
   {
-    id: "regDt", //바꾸기
+    id: "dmndTmng", //바꾸기
     title: "신청일자",
     visible: true,
   },
   {
-    id: "state", //바꾸기
+    id: "splyFcltFlg", //바꾸기
     title: "진행상태",
     visible: true,
   },
diff --git a/apps/wr/components/lib/func/commom.tsx b/apps/wr/components/lib/func/commom.tsx
index 8569d4eb3..6b253bdba 100644
--- a/apps/wr/components/lib/func/commom.tsx
+++ b/apps/wr/components/lib/func/commom.tsx
@@ -165,18 +165,29 @@ export const yearOptions: { val: string; text: string }[] = Array.from(
   })
 );
 
-export const getdmdMatFlag = (flag: string|undefined) => {
-  let flagMat = "";
+export const getdmdMatFlag = (flag: string | undefined | null) => {
+  const cleanFlag = (flag ?? "").trim();
 
-  if(flag === undefined || flag === null) {
-    flagMat = "신청";
-  }else if(flag.trim() === "Sub") {
-    flagMat = "검토";
 
-  }else if(flag.trim() === "matched") {
-    flagMat = "매칭완료";
-  }else {
-    flagMat = "신청";
+  console.log('cleanFlag ', cleanFlag)
+  switch (cleanFlag) {
+    case "Sub":
+      return "검토";
+    case "matched":
+      return "매칭완료";
+    default:
+      return "신청";
   }
-  return flagMat;
 };
+
+
+export const formatPhoneNumber=(tel:string) => {
+  const onlyNums = tel.replace(/[^0-9]/g, '');
+  if (onlyNums.length === 10) {
+    return onlyNums.replace(/(\d{2})(\d{4})(\d{4})/, '$1-$2-$3');
+  } else if (onlyNums.length === 11) {
+    return onlyNums.replace(/(\d{3})(\d{4})(\d{4})/, '$1-$2-$3');
+  } else {
+    return tel; // 유효하지 않으면 빈 문자열
+  }
+}
\ No newline at end of file
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index b22f9474e..aaa7c46b9 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -31,9 +31,11 @@ import toast from "react-hot-toast";
 export default function ConCostForm({
   form,
   type,
+  selectionVersion,
 }: {
   form: UseFormReturn<DmdCoReqType>;
   type: string;
+  selectionVersion: number;
 }) {
   const {
     constCostRes,
@@ -70,7 +72,14 @@ export default function ConCostForm({
   const dmndQtyWatch = form.watch("dmndQty");
   const totalConstCost = form.watch("totalConstCost");
   const cstrnCst = form.watch("demandCst.cstrnCst");
+  const useUsgCdWatch = form.watch("useUsgCd");
 
+  useEffect(() =>{
+    console.log('usgPrcsProcsWatch ', usgPrcsProcsWatch)
+
+    console.log('useUsgCdWatch ' , useUsgCdWatch)
+
+  },[usgPrcsProcsWatch, useUsgCdWatch, selectionVersion])
   const calculateConstCost = useCallback(() => {
     const usgPrcsProcs = usgPrcsProcsWatch;
     const dmndQtyYear = dmndQtyWatch * 365;
@@ -255,7 +264,7 @@ export default function ConCostForm({
                     placeholder=""
                     type="text"
                     onChange={field.onChange}
-                    value={form.getValues("demandCst.usgPrcsProcs") ?? ""}
+                    value={field.value ?? ""}
                     className="mt-2"
                   />
                 </FormUi>
diff --git a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
index fb6ba9b22..25fe5d273 100644
--- a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
@@ -18,12 +18,13 @@ import { Button, Input } from "@common/components/ui";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
+import toast from "react-hot-toast";
 import type { z } from "zod";
 
-export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
+export default function PbnPrfExcelModal({ data ,setIsExcelOPen }: { data: FcPrfType ,setIsExcelOPen:(open:boolean )=>void }) {
   const { prfmnRegData } = useWrStore((state) => state);
 
-  const [files, setFiles] = useState<File[] | null>(null);
+  const [file, setFile] = useState<File | null>(null);
   const [excelData, setExcelData] = useState<PrfType[]>();
   const form = useForm<z.infer<typeof pbnPrfRegExcelZod>>({
     resolver: zodResolver(pbnPrfRegExcelZod),
@@ -31,10 +32,18 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
       ym: String(new Date().getFullYear()),
     },
   });
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const selectedFile = e.target.files?.[0];
+    if (selectedFile) {
+      setFile(selectedFile);
+    }
+  };
   const onSubmit = (values: z.infer<typeof pbnPrfRegExcelZod>) => {
 
     if (excelData) {
       prfmnRegData(excelData as unknown as PrfType);
+      setIsExcelOPen(false)
     }
 
 
@@ -46,31 +55,24 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
     form.setValue("pbnstRuseFcltNm", data.ruseUtztnFcltNm);
   }, [data]);
 
-  useEffect(() => {
-    console.log("excelData", excelData);
-  }, [excelData]);
 
   useEffect(() => {
-    if (files) {
-      console.log("이런")
-      const file = files[0];
+    if (file) {
+      const isFile = file
       if (form.getValues("ym").length < 1) {
-        ToastFormUi({
-          body: "파일업로드 이전에 등록년도를 작성해주세요 ",
-          title: "지도점검 등록",
-        });
-        setFiles(null);
+        toast.error("파일업로드 이전에 등록년도를 작성해주세요 " );
+        setFile(null);
         return;
       }
 
-      if (file) {
-        filePicked(file, 0).then((res) => {
+      if (isFile) {
+        filePicked(isFile, 0).then((res) => {
           if (res !== undefined)
             setExcelData(excelToPbnPrfData(res as unknown as JSON[], form.getValues("ym"), form.getValues('pbnstRuseFcltFk')) as PrfType[])
         });
       }
     }
-  }, [files]);
+  }, [file]);
 
   return (
     <>
@@ -144,14 +146,25 @@ export default function PbnPrfExcelModal({ data }: { data: FcPrfType }) {
                   name="file"
                   render={({ field }) => (
                     <FormUi label="점검결과 파일">
-                      <FileUpload
+                      {/* <FileUpload
                         files={files || []}
                         setFiles={(files: File[] | null) => {
                           if (files) setFiles(files);
                         }}
                         fileTypes="xlsx"
                         maxFiles={1}
-                      ></FileUpload>
+
+
+                        
+                      ></FileUpload> */}
+
+<div className="space-y-4 p-4">
+                      <Input
+                        type="file"
+                        onChange={handleFileChange}
+                        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                        />
+                    </div>
                     </FormUi>
                   )}
                 />
diff --git a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
index cc0eb80bf..a7987577b 100644
--- a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { useWrStore } from "@/app/store";
 import {
+  pbnstRegZod,
   type customPbnst,
   type PbnstRegArrrayType,
   type pubHasuType,
@@ -16,17 +17,23 @@ import {
 } from "@common/components/ui";
 import { useEffect, useState } from "react";
 import { PbnstBuseForm } from "@/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm";
-import { useFieldArray, type UseFormReturn } from "react-hook-form";
+import {
+  useFieldArray,
+  type FieldErrors,
+  type UseFormReturn,
+} from "react-hook-form";
 import { writeRgtrAndMdfr } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg";
+import toast from "react-hot-toast";
+import type { z } from "zod";
 
 export function PbnstRegModal({
   form,
-  setPbnstInsert
+  setPbnstInsert,
 }: {
   form: UseFormReturn<{ items: PbnstRegArrrayType }>;
-  setPbnstInsert: (data: customPbnst) => void
+  setPbnstInsert: (data: customPbnst) => void;
 }) {
-  const {  pbnstInsert } = useWrStore((state) => {
+  const { pbnstInsert } = useWrStore((state) => {
     return state;
   });
   const [pbnstBdstForm, setPbnstBdstForm] = useState<customPbnst>(
@@ -35,13 +42,65 @@ export function PbnstRegModal({
   const [currentTab, setCurrentTab] = useState<string>("mng");
   const [indexMng, setIndexMng] = useState<number>(0);
   const [indexBiz, setIndexBiz] = useState<number>(0);
-  const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
-    const item = valuse.items[indexMng];
-    const data = item ? writeRgtrAndMdfr([item]) : [];
+   const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
+     const item = valuse.items[indexMng];
+     const data = item ? writeRgtrAndMdfr([item]) : [];
+     if (data && data[0]) {
+       setPbnstInsert(data[0]);
+     }
+   };
+  const onInvalid = (
+    errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>
+  ) => {
+    // 재귀 함수를 사용해 중첩된 에러 객체에서 모든 에러 메시지와 경로를 찾습니다.
+    const findAllErrors = (
+      errorObject: any,
+      path: (string | number)[] = []
+    ): { message: string; path: (string | number)[] }[] => {
+      if (!errorObject) return [];
 
-    if (data && data[0]) {
-    //  pbnstInsert(data[0]);
-      setPbnstInsert(data[0])
+      return Object.keys(errorObject).flatMap((key) => {
+        const value = errorObject[key];
+        const currentKey = !isNaN(parseInt(key)) ? parseInt(key) : key;
+        const newPath = [...path, currentKey];
+        if (value && typeof value === "object") {
+          if (typeof value.message === "string") {
+            return [{ message: value.message, path: newPath }]; // 에러 메시지와 경로 반환
+          }
+          return findAllErrors(value, newPath);
+        }
+        return [];
+      });
+    };
+    const errorList = findAllErrors(errors);
+    if (errorList.length > 0) {
+      errorList.forEach((errorInfo) => {
+        const { message, path } = errorInfo;
+        let prefix = "";
+        const itemsIndex = path.indexOf("items");
+
+        if (itemsIndex > -1 && path.length > itemsIndex + 1) {
+          const itemIdx = path[itemsIndex + 1] as number;
+          const facilityName = form.getValues(
+            `items.${itemIdx}.ruseUtztnFcltNm`
+          );
+          if (facilityName) {
+            prefix += `[${facilityName}] `;
+          }
+
+          const fcBizsIndex = path.indexOf("fcBizs");
+          if (fcBizsIndex > -1 && path.length > fcBizsIndex + 1) {
+            const bizIdx = path[fcBizsIndex + 1] as number;
+            const cycle = form.getValues(
+              `items.${itemIdx}.fcBizs.${bizIdx}.cycl`
+            );
+            if (cycle) {
+              prefix += `[${cycle}차수] `;
+            }
+          }
+        }
+        toast.error(`${prefix}${message}`);
+      });
     }
   };
 
@@ -76,7 +135,7 @@ export function PbnstRegModal({
               차수별정보
             </TabsTrigger>
             <Button
-              onClick={form.handleSubmit(onSubmit)}
+              onClick={form.handleSubmit(onSubmit, onInvalid)}
               size={"sm"}
               className="!justify-end"
             >

From 5fd8c6e6a62d056d29682a81143ab43649f5e3a8 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Fri, 4 Jul 2025 22:27:55 +0900
Subject: [PATCH 35/44] =?UTF-8?q?=EA=B2=B0=ED=95=A8=EB=8C=80=EC=9E=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruseFcltMng/fcltReg/pbnstReg/index.tsx    | 12 ++++
 .../ruseFcltMng/fcltReg/pbnstReg/type.tsx     | 15 +++--
 .../ruseFcltMng/fcltReg/rainReg/index.tsx     |  2 +-
 .../ruseFcltMng/fcltReg/rswtReg/index.tsx     | 60 +++++++++----------
 4 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
index ea7eee5c8..e4bedff60 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
@@ -54,6 +54,7 @@ export type pubFacState = {
     pbnsUpdateIndex: pbnstInsertIndex;
     fcOrgwtsNmList:pubHasuType[];
     dmdComList: any[];
+    apiMessage:string;
   };
 };
 type pubFacActions = {
@@ -94,6 +95,7 @@ export const pubFacStateExport: pubFacState = {
     pbnsUpdateIndex: {} as pbnstInsertIndex,
     fcOrgwtsNmList:[],
     dmdComList: [],
+    apiMessage:''
   },
 };
 
@@ -269,8 +271,13 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
           ruseRes
         );
       
+        if(response){
+
+          toast.success(` 하수재이용 시설 정보가 수정되었습니다.`);
+        }
       } catch (error) {
         console.error("Error pbnstRuseFcltUpdate:", error);
+        toast.error(` 하수재이용 시설 정보가 수정오류입니다.`);
       }
     } ,pbnstRuseBizUpdate : async(ruseRes:fcBizType[])=>{
       try {
@@ -280,6 +287,10 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
           `/reuseFc/pubFcBiz`,
           ruseRes 
         );
+
+        if(response){
+          toast.success(` 하수재이용 시설 사업이 수정되었습니다.`);
+        }
         const pbnstRes = await hasuListFetch("11", "11");
 
         return set((state: pubFacState) => ({
@@ -292,6 +303,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
         }));
       } catch (error) {
         console.error("Error pbnstRuseFcltUpdate:", error);
+        toast.error(` 하수재이용 시설 사업이 수정이 실패되엇습니다..`);
       }
     } ,
     getBizCycle: async (pbnstObj: customPbnst) => {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
index b908750fd..a111b6c10 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
@@ -236,10 +236,17 @@ export const fcBizSchema = z.object({
 export const pbnstRegZod = z.object({
   pbnstRuseFcltPk: z.string().default(""),
   swtrmtFcltFk: z.string().default(""),
-  ruseUtztnFcltNm: z.string().default(""),
-  fcltCpct: zNumDefaultZero,
-  ruseCpct: zNumDefaultZero,
-  splyExtraCpct: zNumDefaultZero,
+  ruseUtztnFcltNm: z
+  .preprocess(
+    (v) => (v != null ? String(v).trim() : ""),
+    z.string()
+  )
+  .refine((val) => val.length > 0, {
+    message: "시설 이름을 입력하세요",
+  }),
+   fcltCpct: z.number(),
+  ruseCpct: z.number(),
+  splyExtraCpct: z.number(),
   regDt: zDateDefaultNow,
   rgtr: z.string().default("test"),
   mdfcnDt: zDateDefaultNow,
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
index d4cfebfca..6ceb75531 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
@@ -34,7 +34,7 @@ export const rainZod = z.object({
   bdstNm: z.string().default(""),
   frstArchPrmsnDt: z.date().default(() => new Date()),
   archChgPrmsnDt: z.coerce.date().nullish().default(null),
-  archArea: z.number().default(0),
+  archArea: z.string().default(''),
   archChgArea: z.number().default(0),
   rgtr:z.string().nullish(),
   mdfr:z.string().nullish(),
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
index df9c3b543..d39412d8d 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
@@ -5,11 +5,12 @@ import type { TableUpperProps } from "@/app/store/common/type/header";
 import { z } from "zod";
 import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "../rainReg/type";
 import { makeMdfr, makeRstr } from "../bdstReg";
+import toast from "react-hot-toast";
 
  const rswtrObjSchema = z.object({
   bdstRuseFcltFk: z.number().nullish(),
-  wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
-  oblgTrgtWtrUsqty: z.number().nullish().default(0),
+  //wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
+  //oblgTrgtWtrUsqty: z.number().nullish().default(0),
   orgwtKndCd: z.string({ required_error: validationMessages.requiredSelect("원수 종류") }).min(1, { message: validationMessages.requiredSelect("원수 종류") }),
   filtrTrtmfctCpct: z.number({ required_error: validationMessages.required("처리시설 용량") }),
   filtrTrtmfctProcs: z.string({ required_error: validationMessages.required("주요처리공정") }).min(1, { message: validationMessages.required("주요처리공정") }),
@@ -36,7 +37,7 @@ export const rswtZod = z.object({
   frstArchPrmsnDt: z.date().default(() => new Date()),
   archChgPrmsnDt: z.coerce.date().nullish().default(null),
   chBuildingYn: z.string().nullish(),
-  archArea: z.number().default(0),
+  archArea: z.string().default(''),
   archChgArea: z.number().default(0),
   rgtr: z.string().nullish().default(null),
   mdfr: z.string().nullish().default(null),
@@ -152,8 +153,8 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
       try {
         const chData = await makeMdfr(data);
         const res = await putFectch("/reuseFc/waterreuseFc", chData);
-        if (res.ok) {
-          alert("등록이 완료되었습니다.");
+        if (res.status ===200) {
+          toast.success("중수도 건축물 수정이 완료되었습니다.");
           const rswtRes = await initFetch(code);
           set((state: rswtFacState) => ({
             ...state,
@@ -165,10 +166,8 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
           }));
         }
       } catch (errorUpdate) {
-        alert(
-          "업데이트 오류입니다. " +
-            (errorUpdate instanceof Error ? errorUpdate.message : "")
-        );
+        toast.error("중수도 건축물 수정 오류입니다. ");
+
       } finally {
       }
     },
@@ -176,29 +175,28 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
       try {
         const chData = await makeRstr(data);
         const res = await postFectch("/reuseFc/waterreuseFc", chData);
-        if (res.ok) {
-          if (data.chgBuilding.length > 0) {
-            await res
-              .json()
-              .then((resData: any) => {
-                const chPK = resData?.data?.bdstInfoPk;
-                const makeCh = resData.data.chgBuilding.map(
-                  (item: chgBuilding) => ({
-                    ...item,
-                    bdstInfoFk: chPK,
-                  })
-                );
-                const chch = postFectch("/reuseFc/chgBuilding", makeCh);
-                return chch;
-              })
-              .then((chch: any) => {
-                if (chch.ok) {
-                  alert("등록이 완료되었습니다.");
-                }
-              });
+        if (res.status===200) {
+          if(data.chgBuilding.length > 0){
+              
+            const chPK =  res?.data?.bdstInfoPk
+            const makeCh=    res.data.chgBuilding.map((item: chgBuilding) => 
+                 (  {
+                  ...item,
+                  bdstInfoFk: chPK,
+                })
+              );    
+            const chch=  await postFectch("/reuseFc/chgBuilding", makeCh);
+
+              if(chch.status ===200) {
+                 toast.success("건축물 등록이 완료되었습니다.");
+              }else{
+                toast.error("건축물 증축/개축/중축 오류입니다.");
+              }
           } else {
-            alert("등록이 완료되었습니다.");
+            toast.success("건축물 등록이 완료되었습니다.");
           }
+        }else{
+          toast.error("건축물 등록이 완료되었습니다.");
         }
         const rainRes = await initFetch(code);
         set((state: rswtFacState) => ({
@@ -211,7 +209,7 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = (
         }));
       } catch (e) {
         console.log("e", e);
-        alert("등록 오류입니다.");
+        toast.error("등록시 오류가 발생하였습니다.");
       } finally {
       }
     },

From 5a681420465af0ffe153b9fce121484947c53b9c Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Fri, 4 Jul 2025 22:35:45 +0900
Subject: [PATCH 36/44] =?UTF-8?q?=EC=9B=90=EC=88=98,=EC=B7=A8=EC=88=98=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=B0=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fcltReg/pbnstReg/buseReg/bugRegForm.tsx   | 10 +-
 .../fcOrgwtsRegModal/fcOrgwtsRegModal.tsx     | 99 ++++++++++++-------
 2 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
index 8ea07535d..a1d433f2d 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm.tsx
@@ -111,9 +111,9 @@ export function PbnstBuseForm({
   const fcOrgwts = form.watch(`items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`);
 
   useEffect(() => {
-    console.log("fcOrgwts ", fcOrgwts);
+    console.log("fcOrgwts", fcOrgwts);
     if (fcOrgwts && fcOrgwts?.length > 0) {
-      const swtrmtFcltFkList = fcOrgwts.map((item) => item.swtrmtFcltFk);
+      const swtrmtFcltFkList = fcOrgwts?.map((item) => item.swtrmtFcltFk);
 
       console.log("swtrmtFcltFkList ", swtrmtFcltFkList);
 
@@ -128,8 +128,6 @@ export function PbnstBuseForm({
 
   useEffect(() => {
     if (fcOrgwtsNmList && fcOrgwtsNmList.length > 0) {
-      console.log("fcOrgwtsNmList ", fcOrgwtsNmList);
-      console.log("fcOrgwts ", fcOrgwts);
 
       fcOrgwts?.forEach((item, index) => {
         const orgwtNm = fcOrgwtsNmList.find(
@@ -421,6 +419,7 @@ export function PbnstBuseForm({
                   </div>
                   <RuseMngTable
                     key={`fcOrgwts-${indexMng}-${indexBiz}`} // 이게 핵심!
+                    
                     tableData={
                       form.getValues(
                         `items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`
@@ -724,6 +723,9 @@ export function PbnstBuseForm({
             bodyClass={"w-[70vw] max-w-none max-h-[90vh] overflow-y-auto"}
             body={
               <FcOrgwtsRegModal
+              initTableData={form.getValues(
+                        `items.${indexMng}.fcBizs.${indexBiz}.fcOrgwts`
+                      ) ?? []}
                 closeModal={() => {
                   setIsFcOrgwts(false);
                 }}
diff --git a/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
index 9c8f2cdd6..69ec1afcc 100644
--- a/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
@@ -14,13 +14,16 @@ import { Button } from "@common/business_components/ui/table/lib/button";
 import { Input } from "@common/components/ui";
 import { ArrowLeft, ArrowRight } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
+import toast from "react-hot-toast";
 
 export default function FcOrgwtsRegModal({
   onRightSet,
   closeModal,
+  initTableData,
 }: {
   onRightSet?: (rightData: fcOrgwtType[]) => void;
   closeModal?: (val: boolean) => void;
+  initTableData?: any[];
 }) {
   const { code, pbnst, getSwtrmtFcltNm, searchFclts } = useWrStore(
     (state) => state
@@ -31,6 +34,30 @@ export default function FcOrgwtsRegModal({
   const leftRef = useRef<pubHasuType[] | null>([] as pubHasuType[]);
   const [rightData, setRightData] = useState<pubHasuType[]>();
   const [inputVal, setInputVal] = useState<string>("");
+  const saveData = () => {
+    if (rightData && rightData?.length > 0) {
+      if (onRightSet)
+        onRightSet(
+          (rightData as pubHasuType[])?.map((item) => {
+            return {
+              ...item,
+              swtrmtFcltFk: item.bscFctCd, // 임시값, 실제 데이터에 맞게 수정
+              orgwtWtritQnt: Number(item.fctCpc), // 임시값, 실제 데이터에 맞게 수정
+              tmsYn: "N", // 임시값, 실제 데이터에 맞게 수정
+              dschgFmYn: "N", // 임시값, 실제 데이터에 맞게 수정
+              dtlPstnExpln: item.addr, // 임시값, 실제 데이터에 맞게 수정
+              choose: false, // 임시값, 실제 데이터에 맞게 수정
+            }
+            // 필요한 경우 다른 속성들도 추가
+          }) as unknown as fcOrgwtType[]
+        );
+
+      closeModal?.(false)
+    }
+    else {
+      toast.error("취수하수처리장 목록을 선택해주세요.")
+    }
+  }
 
   useEffect(() => {
     if (Array.isArray(searchFclts)) {
@@ -48,46 +75,50 @@ export default function FcOrgwtsRegModal({
   }, [searchFclts]);
   useEffect(() => {
     if (code.sggCd.length > 0 && pbnstHasuRes.length > 0) {
-      setbdstTable(tableData(pbnstHasuRes, { code }));
-
-      console.log("bdstTable ", bdstTable);
+      const data = pbnstHasuRes.filter((item) => !initTableData?.find((initItem) => initItem.ruseUtztnFcltNm === item.bscFctNm))
+      leftRef.current?.filter((item) => !initTableData?.find((initItem) => initItem.ruseUtztnFcltNm === item.bscFctNm));
+      setbdstTable(tableData(data, { code }));
     }
-  }, [code, pbnstHasuRes]);
+  }, [code, pbnstHasuRes, initTableData]);
+  
 
   useEffect(() => {
-    console.log("rightData    ", rightData);
-    if (onRightSet)
-      onRightSet(
-        (rightData as pubHasuType[])?.map((item) => ({
-          swtrmtFcltFk: item.bscFctCd, // 임시값, 실제 데이터에 맞게 수정
-          orgwtWtritQnt: Number(item.fctCpc), // 임시값, 실제 데이터에 맞게 수정
-          tmsYn: "N", // 임시값, 실제 데이터에 맞게 수정
-          dschgFmYn: "N", // 임시값, 실제 데이터에 맞게 수정
-          dtlPstnExpln: item.addr, // 임시값, 실제 데이터에 맞게 수정
-          choose: false, // 임시값, 실제 데이터에 맞게 수정
-          // 필요한 경우 다른 속성들도 추가
-        })) as unknown as fcOrgwtType[]
-      );
-  }, [rightData]);
+    if (initTableData && Array.isArray(initTableData)) {
+      setRightData(initTableData.map(item => ({
+        ...item,
+        choose: item.choose,
+        sido: item.dtlPstnExpln?.split(" ")[0] || "",
+        gugun: item.dtlPstnExpln?.split(" ")[1] || "",
+        bscFctNm: item.ruseUtztnFcltNm,
+        addr: item.dtlPstnExpln,
+        orgwtWtritQnt: String(item.orgwtWtritQnt),
+        fctCpc: String(item.orgwtWtritQnt),
+        swtrmtFcltFk: item.swtrmtFcltFk,
+      })));
+      rightRef.current = initTableData.map(item => ({ ...item }));
+    }
+  }, []);
 
   return (
     <div className="flex flex-col h-[80vh]">
       <div className="shrink-0 p-4 border-b z-10 bg-white">
         <div className="flex items-center">
           <Title title="취수하수처리장 추가" />
-          {/* <Button size="sm" onClick={() => closeModal?.(false)}>저장</Button> */}
+          
           <div className="flex items-center gap-2 mt-8">
 
-          <Label className="text-xl text-gray-600">시설명</Label>
-          <Input
-            className="w-48 text-xl"
-            type="text"
-            value={inputVal}
-            onChange={(e) => setInputVal(e.target.value)}
-          />
-          <Button size="sm" onClick={() => getSwtrmtFcltNm(inputVal)}>
-            조회
-          </Button>
+
+            <Label className="text-xl text-gray-600">시설명</Label>
+            <Input
+              className="w-48 text-xl"
+              type="text"
+              value={inputVal}
+              onChange={(e) => setInputVal(e.target.value)}
+            />
+            <Button size="sm" onClick={() => getSwtrmtFcltNm(inputVal)}>
+              조회
+            </Button>
+            <Button size="sm" onClick={saveData}>저장</Button>
           </div>
         </div>
       </div>
@@ -107,10 +138,10 @@ export default function FcOrgwtsRegModal({
 
       {/* 테이블 영역 */}
       <div className="flex flex-row gap-4 flex-grow p-4 overflow-x-auto">
-      {/* 왼쪽 테이블 */}
+        {/* 왼쪽 테이블 */}
 
-      <div className="w-5/12 min-w-[400px]">
-      <Label className="text-2xl text-gray-600 mb-2 block text-right">
+        <div className="w-5/12 min-w-[400px]">
+          <Label className="text-2xl text-gray-600 mb-2 block text-right">
             공공하수처리시설 목록
           </Label>
           <RuseMngTable
@@ -123,7 +154,7 @@ export default function FcOrgwtsRegModal({
 
         {/* 중간 이동 버튼 */}
         <div className="flex flex-col justify-center items-center gap-4 w-[200px] min-w-[120px]">
-        <ArrowRight
+          <ArrowRight
             onClick={() => {
               const checked = leftRef.current?.filter((item) => item.choose);
               const unchecked = leftRef.current?.filter((item) => !item.choose);
@@ -159,7 +190,7 @@ export default function FcOrgwtsRegModal({
 
         {/* 오른쪽 테이블 */}
         <div className="w-5/12 min-w-[400px]">
-        <Label className="text-2xl text-gray-600 mb-2 block text-right">
+          <Label className="text-2xl text-gray-600 mb-2 block text-right">
             취수하수처리장 목록
           </Label>
           <RuseMngTable

From 7d56ba0243f84e6f83c571f2fcd4097399300aa3 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 00:46:43 +0900
Subject: [PATCH 37/44] =?UTF-8?q?=ED=95=98=EC=88=98=EC=9E=AC=EC=9D=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/pbnstReg/page.tsx | 91 +++++++++----------
 .../ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx |  8 +-
 .../ruseFcltMng/fcltReg/pbnstReg/type.tsx     | 21 +++--
 .../fcltReg/pbnstRegModal/pbnstRegModal.tsx   | 11 +++
 4 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index 8d7e32c66..0c3ad9dce 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -70,6 +70,8 @@ export default function PublicReuseFaciltyInsert() {
     // defaultValues: { items: pbnstRegArrayZod.parse([]) },
     mode: "onChange",
   });
+  const { isDirty } = form.formState;
+
   const {
     fields: items,
     append,
@@ -87,7 +89,11 @@ export default function PublicReuseFaciltyInsert() {
   }, [pbnst.isInit, pubHasuInit]);
 
   const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
-    const data = writeRgtrAndMdfr(valuse.items);
+
+    if (!isDirty) {
+      toast.error("변경사항이 없습니다."); // 변경사항이 없으면 메시지 표시
+      return;
+    }    const data = writeRgtrAndMdfr(valuse.items);
     let bizs = [] as fcBizType[];
     data.forEach((fclt) => {
       bizs = [...bizs, ...fclt.fcBizs];
@@ -110,78 +116,58 @@ export default function PublicReuseFaciltyInsert() {
   };
 
   // 폼 유효성 검사 실패 시 호출될 함수
-  const onInvalid = (
-    errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>
-  ) => {
-    // 재귀 함수를 사용해 중첩된 에러 객체에서 모든 에러 메시지와 경로를 찾습니다.
+  const onInvalid = (errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>) => {
+    console.log("errors:", errors);
+  
     const findAllErrors = (
       errorObject: any,
       path: (string | number)[] = []
     ): { message: string; path: (string | number)[] }[] => {
       if (!errorObject) return [];
-    
-      // Zod에서 배열 에러는 바로 배열로 전달됨 (예: items: [ {}, {...}, ... ])
-      if (Array.isArray(errorObject)) {
-        return errorObject.flatMap((entry, index) =>
-          findAllErrors(entry, [...path, index])
-        );
-      }
-    
-      if (typeof errorObject === "object") {
-        const entries: { message: string; path: (string | number)[] }[] = [];
-    
-        if (typeof errorObject.message === "string") {
-          entries.push({ message: errorObject.message, path });
-        }
-    
-        if (Array.isArray(errorObject._errors)) {
-          for (const msg of errorObject._errors) {
-            entries.push({ message: msg, path });
+  
+      return Object.keys(errorObject).flatMap((key) => {
+        const value = errorObject[key];
+        const currentKey = !isNaN(parseInt(key)) ? parseInt(key) : key;
+        const newPath = [...path, currentKey];
+  
+        if (value && typeof value === "object") {
+          if (value.message) {
+            return [{ message: value.message, path: newPath }];
           }
+  
+          return findAllErrors(value, newPath);
         }
-    
-        const keys = Object.keys(errorObject).filter(
-          (k) => k !== "message" && k !== "_errors"
-        );
-    
-        for (const key of keys) {
-          entries.push(...findAllErrors(errorObject[key], [...path, key]));
-        }
-    
-        return entries;
-      }
-    
-      return [];
+        return [];
+      });
     };
+  
     const errorList = findAllErrors(errors);
-
-    console.log(' errors ', errors)
+  
     if (errorList.length > 0) {
       errorList.forEach((errorInfo) => {
         const { message, path } = errorInfo;
         let prefix = "";
+  
         const itemsIndex = path.indexOf("items");
-
+  
         if (itemsIndex > -1 && path.length > itemsIndex + 1) {
           const itemIdx = path[itemsIndex + 1] as number;
-          const facilityName = form.getValues(
-            `items.${itemIdx}.ruseUtztnFcltNm`
-          );
+          const facilityName = form.getValues(`items.${itemIdx}.ruseUtztnFcltNm`);
           if (facilityName) {
             prefix += `[${facilityName}] `;
           }
-
+  
           const fcBizsIndex = path.indexOf("fcBizs");
           if (fcBizsIndex > -1 && path.length > fcBizsIndex + 1) {
             const bizIdx = path[fcBizsIndex + 1] as number;
-            const cycle = form.getValues(
-              `items.${itemIdx}.fcBizs.${bizIdx}.cycl`
-            );
+            const cycle = form.getValues(`items.${itemIdx}.fcBizs.${bizIdx}.cycl`);
             if (cycle) {
               prefix += `[${cycle}차수] `;
             }
           }
         }
+  
+        // 최종 오류 메시지 출력
         toast.error(`${prefix}${message}`);
       });
     }
@@ -214,7 +200,14 @@ export default function PublicReuseFaciltyInsert() {
   useEffect(() => {
     if (pbnst.pbnstRes && pbnst.pbnstRes?.length > 0) {
 
-      form.reset({ items: pbnstRegArrayZod.parse(pbnst.pbnstRes) });
+      // form.reset({
+      //   items: pbnstRegArrayZod.parse(pbnst.pbnstRes),
+      // });
+
+      form.reset({ items: pbnst.pbnstRes });
+
+            //form.reset({ items: pbnst.pbnstRes });
+
     } else {
       form.reset({ items: [] });
     }
@@ -249,7 +242,7 @@ export default function PublicReuseFaciltyInsert() {
         //     ] as fcBizType[],
         //   })
         // );
-        append(createDefaultPbnstItem(selecTableRow, pbnstRes.length));
+       append(createDefaultPbnstItem(selecTableRow, pbnstRes.length));
 
         setIsRuseReg({ isModal: true });
       }
@@ -428,7 +421,7 @@ export default function PublicReuseFaciltyInsert() {
                 form={form} // form prop 전달
                 setPbnstInsert={(data) => {
                   if (data) {
-                   // pbnstInsert(data); // pbnstInsert 함수 호출
+                    pbnstInsert(data); // pbnstInsert 함수 호출
                     setIsRuseReg({ isModal: false });
                   }
                 }}
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx
index 14224fce2..3433a62c5 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/utilsZod.tsx
@@ -10,12 +10,12 @@ export function createDefaultPbnstItem(
       pbnstRuseFcltPk: pk,
       swtrmtFcltFk: "",
       ruseUtztnFcltNm: "", // 필수 입력이므로 빈 문자열로
-      fcltCpct: 0,
-      ruseCpct: 0,
-      splyExtraCpct: 0,
+     fcltCpct: 0,
+     ruseCpct: 0,
+     splyExtraCpct: 0,
       regDt: null,
       rgtr: "test",
-      mdfcnDt: null,
+     mdfcnDt: null,
       mdfr: "test",
       fcFiles: [],
       fcBizs: [
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
index a111b6c10..2ef1c6d2f 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
@@ -238,22 +238,23 @@ export const pbnstRegZod = z.object({
   swtrmtFcltFk: z.string().default(""),
   ruseUtztnFcltNm: z
   .preprocess(
-    (v) => (v != null ? String(v).trim() : ""),
-    z.string()
-  )
-  .refine((val) => val.length > 0, {
-    message: "시설 이름을 입력하세요",
-  }),
-   fcltCpct: z.number(),
-  ruseCpct: z.number(),
-  splyExtraCpct: z.number(),
+    (v) => (v !== null && v !== undefined ? String(v).trim() : ""), // null/undefined → "", 공백 제거
+    z.string().min(1, "시설 이름을 입력하세요")),
+   fcltCpct: zNumDefaultZero,
+  ruseCpct: zNumDefaultZero,
+  splyExtraCpct: zNumDefaultZero,
   regDt: zDateDefaultNow,
   rgtr: z.string().default("test"),
   mdfcnDt: zDateDefaultNow,
   mdfr: z.string().default("test"),
   fcFiles: z.array(fcFileSchema).default([]).nullish(),
   fcBizs: z.array(fcBizSchema).default([]),
-  fcOpers: z.array(fcOperSchema).default([]).nullish(),
+  fcOpers: z
+    .array(fcOperSchema)
+    .refine((val) => val.length >= 1, {
+      message: "재이용시설의 운영정보를 최소 하나를 등록해주세요",
+    })
+    .default([]), // 기본값 설정
 });
 
 export const pbnstRegArrayZod = z.array(pbnstRegZod);
diff --git a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
index a7987577b..34bc71a46 100644
--- a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
@@ -42,6 +42,8 @@ export function PbnstRegModal({
   const [currentTab, setCurrentTab] = useState<string>("mng");
   const [indexMng, setIndexMng] = useState<number>(0);
   const [indexBiz, setIndexBiz] = useState<number>(0);
+
+
    const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
      const item = valuse.items[indexMng];
      const data = item ? writeRgtrAndMdfr([item]) : [];
@@ -53,6 +55,8 @@ export function PbnstRegModal({
     errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>
   ) => {
     // 재귀 함수를 사용해 중첩된 에러 객체에서 모든 에러 메시지와 경로를 찾습니다.
+  
+
     const findAllErrors = (
       errorObject: any,
       path: (string | number)[] = []
@@ -72,13 +76,18 @@ export function PbnstRegModal({
         return [];
       });
     };
+
+
     const errorList = findAllErrors(errors);
+
+
     if (errorList.length > 0) {
       errorList.forEach((errorInfo) => {
         const { message, path } = errorInfo;
         let prefix = "";
         const itemsIndex = path.indexOf("items");
 
+
         if (itemsIndex > -1 && path.length > itemsIndex + 1) {
           const itemIdx = path[itemsIndex + 1] as number;
           const facilityName = form.getValues(
@@ -99,6 +108,8 @@ export function PbnstRegModal({
             }
           }
         }
+
+
         toast.error(`${prefix}${message}`);
       });
     }

From c5f7d6290862204309f9b28d6a7bbdaec129d990 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 14:31:10 +0900
Subject: [PATCH 38/44] =?UTF-8?q?=EC=82=AD=EC=A0=9C=EB=90=9C=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=98=EA=B3=A0=20?=
 =?UTF-8?q?=EC=8B=A4=EC=A0=81=20=EC=98=A4=EB=A5=98=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/coMatRvw/page.tsx    |  4 +-
 apps/wr/app/matMng/coMng/coSttn/page.tsx      | 11 ++-
 .../prfmncReg/pbnstPrfmncReg/page.tsx         | 37 +++++++---
 .../wr/app/store/matDmd/coMatRvw/headList.tsx |  4 +-
 apps/wr/app/store/matDmd/coMatRvw/index.tsx   |  4 +-
 apps/wr/app/store/matDmd/coMatRvw/type.tsx    | 74 ++++++++-----------
 apps/wr/app/store/matDmd/coSttn/headList.tsx  |  5 ++
 apps/wr/app/store/matDmd/coSttn/index.tsx     |  2 +-
 .../store/prfmncReg/pbnstPrfmncReg/index.tsx  | 23 ++++--
 apps/wr/components/lib/func/TableData.tsx     | 48 ++++++------
 .../ui/form/coMat/conCostForm/conCostForm.tsx | 20 ++---
 .../pbnPrfExcelModal/pbnPrfExcelModal.tsx     |  6 +-
 12 files changed, 136 insertions(+), 102 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
index 46aeacbf3..acfdb6585 100644
--- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
@@ -119,7 +119,7 @@ export default function CoMatRvw() {
   }, [useUsgCdWatch, form,selectionVersion]);
 
   useEffect(() => {
-    if (coMatRvwRes.length > 0) {
+    if (coMatRvwRes&&coMatRvwRes.length > 0) {
       const data = coMatRvwRes?.map((item, index) => {
         let flag = "";
         
@@ -190,7 +190,7 @@ export default function CoMatRvw() {
                   <div className="col-span-7 w-full">
                     <div className="flex flex-row items-center">
                       <Label className="text-xl text-gray-600 mx-6">
-                        하수 재이용년도
+                      수요신청년도
                       </Label>
                       <SelectBox
                         className="h-full w-32 text-2xl"
diff --git a/apps/wr/app/matMng/coMng/coSttn/page.tsx b/apps/wr/app/matMng/coMng/coSttn/page.tsx
index 181a5d82f..e2c8b8195 100644
--- a/apps/wr/app/matMng/coMng/coSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/coSttn/page.tsx
@@ -5,6 +5,7 @@ import { btnClass } from "@/app/store/common/code";
 import { fetchType, getFetch } from "@/components/lib/api";
 import {
   excelDownload,
+  formatPhoneNumber,
   getCity,
   tableData
 } from "@/components/lib/func/commom";
@@ -26,6 +27,7 @@ import ListDiv from "@common/business_components/ui/list_div";
 import SdmInsertForm from "@common/business_components/ui/sdmInsertForm";
 import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
 import { Button } from "@common/components/ui";
+import moment from "moment";
 import { useCallback, useEffect, useState } from "react";
 import toast, { Toaster } from "react-hot-toast";
 
@@ -83,6 +85,9 @@ export default function CoSttn() {
         const data = tableData(coSttnRes, { code });
         const chData = data.map((item: any) => ({
           ...item,
+          telno:formatPhoneNumber(item.telno||undefined),
+          regDt: moment(item.regDt).format("YYYY-MM-DD")
+
         }));
         // .filter((item: any) => item !== undefined);
         setBdstTable(chData);
@@ -162,7 +167,7 @@ export default function CoSttn() {
               </SearchFormLeft>
               <SearchFormRight className="w-2/12 mx-5 flex flex-col items-center justify-center space-x-2 ">
                 <div className="flex flex-row space-x-2">
-                  <Button size={"sm"} onClick={searchClick}>
+                  <Button className="mt-2" size={"sm"} onClick={searchClick}>
                     조회
                   </Button>
                   <Button
@@ -182,7 +187,7 @@ export default function CoSttn() {
                     onClick={() => {
                       /* 저장 로직 */
                       if (!upadateData) {
-                        <ToastFormUi body={"수요처 변경을 원하는 행을 선택해주세요"} title={"수요처관리"}></ToastFormUi>;
+                        toast.error("수요처 변경을 원하는 행을 선택해주세요")
                       }else{
                         setIsDmdModal({
                           ...isDmdModal,
@@ -190,7 +195,7 @@ export default function CoSttn() {
                       }
                     }}
                   >
-                    저장
+                    수정
                   </Button>
                   <Button
                     size={"sm"}
diff --git a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
index f86367a17..c54725ff2 100644
--- a/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/prfmncReg/pbnstPrfmncReg/page.tsx
@@ -53,10 +53,11 @@ export default function prfmncPrfmncReg() {
   const [inputData, setInputData] = useState<any[]>();
   const [pbnstRuseFcltPk, setPbnstRuseFcltPk] = useState<string>();
   const [pageNation, setPageNation] = useState<number>(1);
-  const [cellNum, setCellNum] = useState<number>();
+  const [cellNum, setCellNum] = useState<number>(1);
   const [searchYear, setSearchYear] = useState<string>(
     String(new Date().getFullYear())
   );
+
   const excelClick = useCallback(() => {
     excelDownload(
       [[]],
@@ -66,21 +67,22 @@ export default function prfmncPrfmncReg() {
     );
   }, [prfmnc.excelList]);
 
-  const onSave = useCallback(() => {
+  const onSave = useCallback(
+    async() => {
     if (pbnstRuseFcltPk) {
-      prfmnRegData(
+     await prfmnRegData(pageNation,'41',
         excelToPbnPrfData(
           inputData as unknown as JSON[],
           searchYear,
           pbnstRuseFcltPk
         ) as unknown as PrfType
       );
-      prfmncHasuInit(String(pageNation), "41");
+       // cellClick(cellNum)
     }
-  }, [inputData, searchYear, pbnstRuseFcltPk, prfmncHasuInit, pageNation]);
+  }, [inputData, searchYear, pbnstRuseFcltPk, pageNation,cellNum]);
 
   const cellClick = useCallback(
-    (index: number | undefined, headId: string) => {
+    (index: number | undefined) => {
       if (index !== undefined) {
         setIsExcelOPen({
           isModal: false,
@@ -152,7 +154,6 @@ export default function prfmncPrfmncReg() {
           }
           const tableData = [...inUsageData, ...outUsageData, usageTotalObj];
           setPbnstRuseFcltPk(prfmncRes[index].pbnstRuseFcltPk);
-
           setInputData(tableData);
         } else {
           setInputData([]);
@@ -164,12 +165,17 @@ export default function prfmncPrfmncReg() {
 
   useEffect(() => {
     if (!prfmnc.isInit) {
-      prfmncHasuInit("1", "41");
+      prfmncHasuInit(1, "41");
     }
   }, [prfmnc.isInit, prfmncHasuInit]);
   useEffect(() => {
     setbdstTable(prfmncRes);
-  }, [prfmncRes]);
+
+    // cellNum이 0일 경우(첫 번째 행)도 유효한 인덱스이므로 undefined 여부만 체크합니다.
+    if (cellNum !== undefined) {
+      cellClick(cellNum);
+    }
+  }, [prfmncRes, cellNum, cellClick]);
 
   return (
     <>
@@ -250,13 +256,14 @@ export default function prfmncPrfmncReg() {
             <ListDiv className="min-h-0">
               <ScrollArea className="h-[60vh]">
                 <UiTable
+                  key={'leftTable'}
                   tableData={bdstTable || []}
                   headlist={pbnstPrfmncHeadList}
                   pageSize={10}
                   total={10000}
                   headName={"하수재이용시설 목록"}
                   cellClick={(index: number | undefined, headId: string) => {
-                    cellClick(index, headId);
+                    cellClick(index);
                     setCellNum(index ?? 0);
                   }}
                   onPageChange={setPageNation}
@@ -277,7 +284,7 @@ export default function prfmncPrfmncReg() {
                 <TableHeader className="font-bold">
                   {headMakeprfmnc(monthHeadList, [])}
                 </TableHeader>
-                <TableBody>
+                <TableBody key={prfmnc.pageKey+'pageKey'}>
                   {InputTableBody(inputData ?? [], monthHeadList, setInputData)}
                 </TableBody>
               </Table>
@@ -292,7 +299,15 @@ export default function prfmncPrfmncReg() {
             data={isExcelOpen.data}
             setIsExcelOPen={(open) => {
               setIsExcelOPen({ ...isExcelOpen, isModal: open })
+
             }}
+            setModalExcelData={ async(excelData ) =>{
+              await prfmnRegData(pageNation,'41',
+                excelData,
+              );
+              // 데이터 저장 후 UI 업데이트는 useEffect가 감지하여 처리하므로 여기서는 호출하지 않습니다.
+            }
+          }
           ></PbnPrfExcelModal>
         }
         open={isExcelOpen.isModal}
diff --git a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
index 6b783ea68..6d9bf8862 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/headList.tsx
@@ -29,12 +29,12 @@ export const coRvwHeadListExport: CommonTableProps[]= [
     visible: true,
   },
   {
-    id: "dmndTmng", //바꾸기
+    id: "dmndTmng", 
     title: "신청일자",
     visible: true,
   },
   {
-    id: "splyFcltFlg", //바꾸기
+    id: "splyFcltFlg", 
     title: "진행상태",
     visible: true,
   },
diff --git a/apps/wr/app/store/matDmd/coMatRvw/index.tsx b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
index 89836957b..4140905cf 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/index.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
@@ -102,7 +102,9 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
           `/reuseFc/request/cst/${splyCd}/${dmdCd}`,
           data
         );
-
+        if(isUpdate){
+          toast.error("수요 매칭 검토 검토로 저장되었습니다.");
+        }
         const coMatRvwRes = coMatInit(
           1,
           10,
diff --git a/apps/wr/app/store/matDmd/coMatRvw/type.tsx b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
index 9f146c0fb..979e24d55 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/type.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
@@ -1,24 +1,24 @@
 import { z } from "zod";
 
   const DemandInfoSchema = z.object({
-    dmdInfoSn: z.number(),
-    dmdInfoFk: z.string(),
-    dmndTmng: z.coerce.date(),
-    dmndQty: z.number(),
-    wntUntprc: z.number(),
-    grssClfg: z.number(),
-    combResdch: z.number(),
-    trbt: z.number(),
+    dmdInfoSn: z.number().nullish(),
+    dmdInfoFk: z.string().nullish(),
+    dmndTmng: z.coerce.date().nullish(),
+    dmndQty: z.number().nullish(),
+    wntUntprc: z.number().nullish(),
+    grssClfg: z.number().nullish(),
+    combResdch: z.number().nullish(),
+    trbt: z.number().nullish(),
     blgcOxygDmndQnt: z.number(),
-    smll: z.number(),
+    smll: z.number().nullish(),
     crmty: z.number().nullish(),
-    tn: z.number(),
-    tph: z.number(),
+    tn: z.number().nullish(),
+    tph: z.number().nullish(),
     ph: z.number(),
-    clIonQnt: z.number(),
-    cdtnv: z.number(),
-    rmrk: z.string(),
-    useUsgCd: z.string(),
+    clIonQnt: z.number().nullish(),
+    cdtnv: z.number().nullish(),
+    rmrk: z.string().nullish(),
+    useUsgCd: z.string().nullish(),
     mtchnCmptnYmd: z.string().nullish(),
     rvwCmptnYmd: z.string().nullish()
   });
@@ -38,28 +38,28 @@ import { z } from "zod";
   });
   
   const DemandCoSchema = z.object({
-    dmdInfoPk: z.string(),
-    dmdCoNm: z.string(),
-    ctpvCd: z.string(),
-    sggCd: z.string(),
-    daddr: z.string(),
-    splyBgngDay: z.coerce.date(),
-    splyEndDay: z.coerce.date(),
-    splyCpct: z.number(),
+    dmdInfoPk: z.string().nullish(),
+    dmdCoNm: z.string().nullish(),
+    ctpvCd: z.string().nullish(),
+    sggCd: z.string().nullish(),
+    daddr: z.string().nullish(),
+    splyBgngDay: z.coerce.date().nullish(),
+    splyEndDay: z.coerce.date().nullish(),
+    splyCpct: z.number().nullish(),
     splyFmYn: z.string().nullish(),
-    telno: z.string(),
+    telno: z.string().nullish(),
     useUsgCd: z.string().nullish(),
     regDt: z.coerce.date().nullish(),
     rgtr: z.string().nullish(),
     mdfcnDt: z.coerce.date().nullish(),
     mdfr: z.string().nullish(),
-    dmdAplyPswd: z.string(),
+    dmdAplyPswd: z.string().nullish(),
     demandInfo: z.array(DemandInfoSchema.nullish()).nullish(), // 안쓰는 거임
     demandMatchings: z.array(DemandMatchingSchema.nullish()).nullish()// 안쓰는 거임
   });
   
   const DemandCstSchema = z.object({
-    dmdInfoSn: z.number(),
+    dmdInfoSn: z.number().nullish(),
     usgPrcsProcs: z.string().nullish(),
     cstrnCst: z.number(),
     fcltSbsdCstrnCst: z.number(),
@@ -69,9 +69,9 @@ import { z } from "zod";
   export const DmdCoReqSchema = z.object({
     cityText:z.string().nullish(),
     sggText:z.string().nullish(),
-    dmdInfoSn: z.number(),
-    dmdInfoFk: z.string(),
-    dmndTmng: z.coerce.date(),
+    dmdInfoSn: z.number().nullish(),
+    dmdInfoFk: z.string().nullish(),
+    dmndTmng: z.coerce.date().nullish(),
     dmndQty: z.number(),
     wntUntprc: z.number().nullish(),
     grssClfg: z.number().nullish(),
@@ -139,23 +139,7 @@ export type RvwHistTableType = {
 
 }
 
-export type RvwHistTableType = {
-  cityText:string,
-  sggText:string,
-  dmdCoNm:string,
-  daddr:string,
-  telno:string,
-  regDt:string,
-  rvwCmptnYmd:string,
-  mtchnCmptnYmd:string,
-  ruseUtztnFcltNm:string,
-  dmndQty:string,
-  useUsgCd:string,
-  splyFcltFlg:string
-  completeYn:boolean
-  dmdInfoSn	:string
 
-}
 
 
 
diff --git a/apps/wr/app/store/matDmd/coSttn/headList.tsx b/apps/wr/app/store/matDmd/coSttn/headList.tsx
index 80fed0d76..62c3002ac 100644
--- a/apps/wr/app/store/matDmd/coSttn/headList.tsx
+++ b/apps/wr/app/store/matDmd/coSttn/headList.tsx
@@ -44,6 +44,11 @@ export const coSttHeadListExport: z.infer<typeof sttnHeadListType> = [
     title: "전화번호",
     visible: true,
   },
+  {
+    id: "regDt",
+    title: "등록일자",
+    visible: true,
+  },
 ];
 
 export const coSttNodeListExport: CommonTableProps[] = [
diff --git a/apps/wr/app/store/matDmd/coSttn/index.tsx b/apps/wr/app/store/matDmd/coSttn/index.tsx
index 0de37bbfc..5e8baf859 100644
--- a/apps/wr/app/store/matDmd/coSttn/index.tsx
+++ b/apps/wr/app/store/matDmd/coSttn/index.tsx
@@ -2,7 +2,7 @@ import type { CommonTableProps } from "@/app/store/common/type/header";
 import { fetchType, getFetch, getFetchWithCount } from "@/components/lib/api";
 import { coSttHeadListExport, coSttNodeListExport } from "./headList";
 import { excelCoSttnParsing } from "./excel";
-import type { DemandCompType } from "@common/business_components/ui";
+import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
 
 // 테이블 헤드 리스트
 const coSttNodeList = coSttNodeListExport;
diff --git a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx
index 82f2ed59c..387f56eb7 100644
--- a/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx
+++ b/apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx
@@ -16,6 +16,7 @@ export type pbnstPrfmncState = {
     monthHeadList: TableUpperProps[];
     prfmncRes: FcPrfType[];
     excelList: Number[];
+    pageKey:number
   };
 };
 
@@ -26,21 +27,22 @@ export const pbnstPrfmncStateExport: pbnstPrfmncState = {
     monthHeadList: monthHeadList,
     prfmncRes: [],
     excelList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    pageKey:1
   },
 };
 
 export type pbnstPrfmncType = pbnstPrfmncState & pbnstPrfmncActions;
 
 type pbnstPrfmncActions = {
-  prfmncHasuInit: (page: string, sggOrCity: string) => void;
-  prfmnRegData: (data: PrfType) => void;
+  prfmncHasuInit: (page: number, sggOrCity: string) => void;
+  prfmnRegData: (page:number,sggOrCity:string, data: PrfType) => void;
 };
 
 const checkWrRegList = async () => {
   const wrRegList = await getFetch("wr", `/reuseFc/pubDetailList`);
   return wrRegList;
 };
-const hasuListFetch = async (page: string, sggOrCity: string) => {
+const hasuListFetch = async (page: number, sggOrCity: string) => {
   const checkWrRegListRes = await checkWrRegList();
   const rainRes = await postFectch(
     `/prcsFclt/ruseInfo/${page ? page : 1}/10/A/${sggOrCity ? sggOrCity : "11"}/0/1/SW`,
@@ -74,7 +76,7 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
   set: any
 ) => {
   return {
-    prfmncHasuInit: async (page: string, sggOrCity: string) => {
+    prfmncHasuInit: async (page: number, sggOrCity: string) => {
       try {
         const prfmncRes = await hasuListFetch(page, sggOrCity);
         return set((state: pbnstPrfmncState) => ({
@@ -89,7 +91,7 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
         console.log(errorHasu);
       }
     },
-    prfmnRegData: async (data: PrfType) => {
+    prfmnRegData: async (page:number,sggOrCity:string,data: PrfType) => {
       try {
         const ressponse = await postFectch(
           "/reuseFc/pubFcPrf",
@@ -100,6 +102,17 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
 
         if (ressponse.status === 200) {
           toast.success("하수재이용 시설 실적 등록이 완료되었습니다.");
+          const prfmncRes = await hasuListFetch(page, sggOrCity);
+          return set((state: pbnstPrfmncState) => ({
+            ...state,
+            prfmnc: {
+              ...state.prfmnc,
+              prfmncRes: prfmncRes,
+              isInit: false,
+              pageKey: state.prfmnc.pageKey + 1
+            },
+          }));
+
         }
       } catch (e) {
         console.log(e);
diff --git a/apps/wr/components/lib/func/TableData.tsx b/apps/wr/components/lib/func/TableData.tsx
index 7a35e02c4..8bed17187 100644
--- a/apps/wr/components/lib/func/TableData.tsx
+++ b/apps/wr/components/lib/func/TableData.tsx
@@ -2,6 +2,7 @@ import type { TableUpperProps } from "@/app/store/common/type/header";
 import type { rainChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rainChkgdn";
 import type { rswtChkZodType } from "@/app/store/prfmncReg/chkgdnReg/rswrtChkgdn";
 import { Checkbox, Input, TableCell, TableRow } from "@common/components/ui";
+import { useEffect } from "react";
 
 export const rainChkTableData = (chkData: rainChkZodType[]) => {
   // 1. chkgdnFk + utztnUsgCd 기준 누계 정보 만들기
@@ -54,27 +55,32 @@ export const rainChkTableData = (chkData: rainChkZodType[]) => {
 export const rswtChkTableData = (chkData: rswtChkZodType[]) => {
   // 1. chkgdnFk + utztnUsgCd 기준 누계 정보 만들기
   const makeRswtData: any[] = [];
-  chkData?.forEach((root) => {
-    root.rswtrDetails.forEach((detail) => {
-      let flatRswtChk = {};
-      const findGuide = root.guideDetails.find(
-        (guide) => guide.utztnUsgCd === detail.utztnUsgCd
-      );
-      const findPoluttion = root.rswtrPollutions.find(
-        (polution) => polution.utztnUsgCd === detail.utztnUsgCd
-      );
-      const operMngCd = root?.reuseBuilding.operMngCd;
-      flatRswtChk = {
-        ...root,
-        ...detail,
-        ...findGuide,
-        ...findPoluttion,
-        ...flatRswtChk,
-        operMngCd: operMngCd,
-      };
-      makeRswtData.push(flatRswtChk);
+
+
+  if(chkData&&chkData.length>0){
+
+    chkData?.forEach((root) => {
+      root.rswtrDetails.forEach((detail) => {
+        let flatRswtChk = {};
+        const findGuide = root.guideDetails.find(
+          (guide) => guide.utztnUsgCd === detail.utztnUsgCd
+        );
+        const findPoluttion = root.rswtrPollutions.find(
+          (polution) => polution.utztnUsgCd === detail.utztnUsgCd
+        );
+        const operMngCd = root?.reuseBuilding.operMngCd;
+        flatRswtChk = {
+          ...root,
+          ...detail,
+          ...findGuide,
+          ...findPoluttion,
+          ...flatRswtChk,
+          operMngCd: operMngCd,
+        };
+        makeRswtData.push(flatRswtChk);
+      });
     });
-  });
+  }
   return makeRswtData;
 };
 
@@ -93,6 +99,7 @@ export const chRowspanTable = (
   let order = 0
   // rowspan된 셀 렌더링 여부 추적용
   const renderedMap = new Map<string, Set<number>>();
+ 
   return (
     <>
       {makeTableData.map((row, rowIndex) => (
@@ -228,7 +235,6 @@ export const InputTableBody = (
     }
     return span;
   };
-
  return (
     <>
       {chgRes.map((data, dataIndex) => {
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index aaa7c46b9..2653f4be9 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -138,7 +138,7 @@ export default function ConCostForm({
     if (type === "mat") {
       const data: DedMatUpdateType = {
         dmdInfoSn: form.getValues("dmdInfoSn"),
-        usgPrcsProcs: form.getValues("demandCst.usgPrcsProcs"),
+        usgPrcsProcs: form.getValues("demandCst.usgPrcsProcs")|| "",
         cstrnCst: form.getValues("demandCst.cstrnCst"),
         fcltSbsdCstrnCst: form.getValues("demandCst.fcltSbsdCstrnCst"),
         prcsFcltCpctCstrnCst: form.getValues("demandCst.prcsFcltCpctCstrnCst"),
@@ -294,7 +294,9 @@ export default function ConCostForm({
           <div className="col-span-12 w-full">
             <h1 className={formH1Class}>공사비 입력사항</h1>
           </div>
-          <div className="col-span-3 mt-4">
+
+
+          <div className="col-span-2 mt-4">
             <div className="flex items-center justify-between">
               <PopoverUi
                 childrenTriger={
@@ -333,7 +335,7 @@ export default function ConCostForm({
               )}
             />
           </div>
-          <div className="col-span-3 mt-4">
+          <div className="col-span-2 mt-4">
             <div className="flex items-center justify-between">
               <PopoverUi
                 childrenTriger={
@@ -372,12 +374,12 @@ export default function ConCostForm({
               )}
             />
           </div>
-          <div className="col-span-3 mt-4">
+          <div className="col-span-2 mt-4">
             <PopoverUi
               childrenTriger={
                 <>
                   <Label className="underline">
-                    총사업비 (백만원) <i className="diveicon di-search" />
+                  처리시설 총사업비(백만원)  <i className="diveicon di-search" />
                   </Label>
                 </>
               }
@@ -414,7 +416,7 @@ export default function ConCostForm({
               )}
             />
           </div>
-          <div className="col-span-3 mt-4">
+          {/* <div className="col-span-3 mt-4">
             <div className="flex items-center justify-between">
               <Label>공급처 선정</Label>
               <Button size={"sm"} onClick={(e) => {}} className="bg-none">
@@ -437,8 +439,8 @@ export default function ConCostForm({
                 </FormUi>
               )}
             />
-          </div>
-          <div className="col-span-4 mt-4">
+          </div> */}
+          <div className="col-span-3 mt-4">
             <FormField
               control={form.control}
               name="demandCst.cstrnCst"
@@ -457,7 +459,7 @@ export default function ConCostForm({
               )}
             />
           </div>
-          <div className="col-span-4 mt-4 mb-3">
+          <div className="col-span-3 mt-4 mb-3">
             <Label className="text-xl">
               처리시설 + 공급관로 총사업비（백만원)
             </Label>
diff --git a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
index 25fe5d273..b4b87663e 100644
--- a/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
+++ b/apps/wr/components/ui/modal/chkgd/pbnPrfExcelModal/pbnPrfExcelModal.tsx
@@ -21,7 +21,7 @@ import { useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import type { z } from "zod";
 
-export default function PbnPrfExcelModal({ data ,setIsExcelOPen }: { data: FcPrfType ,setIsExcelOPen:(open:boolean )=>void }) {
+export default function PbnPrfExcelModal({ data ,setIsExcelOPen ,setModalExcelData}: { data: FcPrfType ,setIsExcelOPen:(open:boolean )=>void,setModalExcelData:(excelData :PrfType)=>void }) {
   const { prfmnRegData } = useWrStore((state) => state);
 
   const [file, setFile] = useState<File | null>(null);
@@ -42,7 +42,9 @@ export default function PbnPrfExcelModal({ data ,setIsExcelOPen }: { data: FcPrf
   const onSubmit = (values: z.infer<typeof pbnPrfRegExcelZod>) => {
 
     if (excelData) {
-      prfmnRegData(excelData as unknown as PrfType);
+    //  prfmnRegData(1,'41',   excelData as unknown as PrfType);
+
+      setModalExcelData(excelData as unknown as PrfType)
       setIsExcelOPen(false)
     }
 

From 103c5d3cb1102d6994ad2a842e42d245fac511e9 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 16:15:08 +0900
Subject: [PATCH 39/44] =?UTF-8?q?=EC=88=98=EC=9A=94=EB=A7=A4=EC=B9=AD?=
 =?UTF-8?q?=EA=B2=80=ED=86=A0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/coMatRvw/page.tsx    |  18 +-
 apps/wr/app/matMng/coMng/coSttn/page.tsx      |  37 ++-
 apps/wr/app/store/common/searchCode/index.ts  |  19 +-
 apps/wr/app/store/matDmd/coMatRvw/index.tsx   |  69 +++--
 apps/wr/app/store/matDmd/coMatRvw/type.tsx    | 268 +++++++++---------
 .../ui/form/coMat/conCostForm/conCostForm.tsx |  45 ++-
 6 files changed, 248 insertions(+), 208 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
index acfdb6585..0bb06770a 100644
--- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
@@ -93,12 +93,12 @@ export default function CoMatRvw() {
 
   const form = useForm<z.infer<typeof DmdCoReqSchema>>({
     resolver: zodResolver(DmdCoReqSchema),
-    shouldUnregister: true
+    shouldUnregister: false,
+   // defaultValues: DmdCoReqSchema.parse({})
   });
 
   
   const TableCellClick = (index: number) => {
-    console.log(coMatRvwRes);
     if (coMatRvwRes && coMatRvwRes[index]) {
       setSelectData(coMatRvwRes[index]);
       setSelectionVersion((v) => v + 1); // 행을 클릭할 때마다 버전을 1씩 증가
@@ -107,7 +107,6 @@ export default function CoMatRvw() {
   const useUsgCdWatch = useWatch({ control: form.control, name: "useUsgCd" });
   useEffect(() => {
 
-    console.log(' useUsgCdWatch page ' ,useUsgCdWatch)
     if (useUsgCdWatch) {
       form.setValue(
         "demandCst.usgPrcsProcs",
@@ -160,7 +159,15 @@ export default function CoMatRvw() {
 
   useEffect(() => {
     if (selectData) {
-      form.reset(selectData);
+
+      try {
+        DmdCoReqSchema.parse(selectData);
+      } catch (e) {
+        if (e instanceof z.ZodError) {
+          console.log(e.flatten());
+        }
+      }
+      form.reset( selectData);
         setSelectionVersion((v) => v + 1); // 강제로 바뀌었다고 알리기
     }
   }, [selectData, form]);
@@ -168,6 +175,7 @@ export default function CoMatRvw() {
     <>
       <ContentsDiv>
         <div className="grid grid-cols-4 gap-4">
+
           <div className="col-span-4">
             <Title title={"수요매칭검토"} />
             <SearchDiv>
@@ -288,7 +296,7 @@ export default function CoMatRvw() {
                     <div className="col-span-3 mt-4">
                       <FormField
                         control={form.control}
-                        name="demandCo.regDt"
+                        name="dmndTmng"
                         render={({ field }) => (
                           <FormUi label="요구시기">
                             <Input
diff --git a/apps/wr/app/matMng/coMng/coSttn/page.tsx b/apps/wr/app/matMng/coMng/coSttn/page.tsx
index e2c8b8195..e828f4226 100644
--- a/apps/wr/app/matMng/coMng/coSttn/page.tsx
+++ b/apps/wr/app/matMng/coMng/coSttn/page.tsx
@@ -61,17 +61,29 @@ export default function CoSttn() {
   const [seartchTxt, setSearchTxt] = useState<string>();
   const [upadateData, setUpdateData] = useState<DemandCompType>();
   
-  const getSelCity = (val: string | number) => {
-    const cityValue = String(val); // Ensure val is treated as a string
-    const data = getCity(cityValue, code.sggCd);
-    setSelectSgg(data);
-    setObjSearch({ city: cityValue, sgg: "" });
-  };
+  const getSelCity = useCallback((val: string | number) => {
+      const cityValue = String(val);
+      const data = getCity(cityValue, code.sggCd);
+      setSelectSgg(data);
+      // 시/도를 변경하면 시/군/구는 '전체'("0")로 초기화합니다.
+      setObjSearch({ city: cityValue, sgg: "0" });
+    }, [code.sggCd]);
 
-  const getSgg = (val: string | number) => {
-    setObjSearch({ ...objSearch, sgg: String(val) });
-  };
+  const getSgg = useCallback((val: string | number) => {
+    setObjSearch((prev) => ({ ...prev, sgg: String(val) }));
+  }, []);
 
+  useEffect(() => {
+    // code.cityCd 데이터가 로드되었고, 아직 시/도 선택이 안된 초기 상태일 때 실행
+    if (code.cityCd && code.cityCd.length > 0 && !objSearch.city) {
+      const firstCityVal = code.cityCd[0]?.val;
+      if (firstCityVal) {
+        // 첫 번째 시/도 값으로 상태를 초기화합니다.
+        getSelCity(firstCityVal);
+      }
+    }
+  }, [code.cityCd, objSearch.city, getSelCity]);
+  
   useEffect(() => {
     if (!coSttn.isInit) {
       coSttnInit("1", "13", "0");
@@ -124,8 +136,11 @@ export default function CoSttn() {
 
   const searchClick = () => {
     const con = (objSearch.sgg && objSearch.sgg !== "0") ? objSearch.sgg : objSearch.city;
+
     if (con) {
       if (seartchTxt && seartchTxt?.length > 0) {
+
+        console.log(' seartchTxt ', seartchTxt)
         coSttnTxtSearch("1", "13", String(con), seartchTxt ?? "");
       } else {
         coSttnSearch("1", "13", String(con));
@@ -147,13 +162,15 @@ export default function CoSttn() {
                     selectClass={""}
                     selectArray={code.cityCd || []}
                     onSelectValue={getSelCity}
+                    value={objSearch.city}
                   />
                   <SelectBox
                     className="col-span-2 w-1/6 h-full text-2xl"
                     label="시군구"
                     selectClass={""}
-                    selectArray={selectSgg?selectSgg : [{text:"전체",val:"0"}]}
+                    selectArray={selectSgg || []}
                     onSelectValue={getSgg}
+                    value={objSearch.sgg}
                   />
                   <SearchInput
                     className={"!text-3xl"}
diff --git a/apps/wr/app/store/common/searchCode/index.ts b/apps/wr/app/store/common/searchCode/index.ts
index 51ebda8a5..893e6ee10 100644
--- a/apps/wr/app/store/common/searchCode/index.ts
+++ b/apps/wr/app/store/common/searchCode/index.ts
@@ -94,10 +94,13 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
         `/reuseFc/request/${searchNm}/${cnt}`
       );
 
-      console.log(coList);
-      set((state: comFcltState) => {
-        return (state.demandCompList = [...coList]);
-      });
+
+      if(coList&&coList.length>0){
+
+        set((state: comFcltState) => {
+          return (state.demandCompList = [...coList]);
+        });
+      }
     },
     regDemandCompany: async (data: DemandCompType) => {
       try {
@@ -112,9 +115,10 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
         } else {
           message = "fail";
         }
+
+
         set((state: comFcltState) => {
-          state.dmdIsSucees = message;
-          return state;
+          return state.dmdIsSucees = message;
         });
       } catch (err) {
         console.log(err);
@@ -132,8 +136,7 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
         }
 
         set((state: comFcltState) => {
-          state.dmdIsSucees = message;
-          return state;
+          return state.dmdIsSucees = message;
         });
       } catch (err) {
         console.log(err);
diff --git a/apps/wr/app/store/matDmd/coMatRvw/index.tsx b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
index 4140905cf..a1a7c187d 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/index.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
@@ -1,13 +1,18 @@
-import {  constCostHeadListExport, coRvwHeadListExport, coRvwNodeListExport, rateFeeHeadListExport } from "./headList";
+import {
+  constCostHeadListExport,
+  coRvwHeadListExport,
+  coRvwNodeListExport,
+  rateFeeHeadListExport,
+} from "./headList";
 import type { CommonTableProps } from "../../common/type/header";
 import type { DedMatUpdateType, DmdCoReqType } from "./type";
 import { fetchType, getFetch, putFectch } from "@/components/lib/api";
-import toast from "react-hot-toast/headless";
+import toast from "react-hot-toast";
 
 const coRvwHeadList = coRvwHeadListExport;
 const coRvwNodeList = coRvwNodeListExport;
-const rateFeeHeadList =rateFeeHeadListExport;
-const constCostHeadList=constCostHeadListExport
+const rateFeeHeadList = rateFeeHeadListExport;
+const constCostHeadList = constCostHeadListExport;
 export type coRvwState = {
   coRvw: {
     isInit: boolean;
@@ -25,8 +30,8 @@ export const coRvwStateExport: coRvwState = {
     coMatRvwRes: [],
     coRvwHeadList: coRvwHeadList,
     coRvwNodeList: coRvwNodeList,
-    rateFeeHeadList:rateFeeHeadList,
-    constCostHeadList:constCostHeadList
+    rateFeeHeadList: rateFeeHeadList,
+    constCostHeadList: constCostHeadList,
   },
 };
 
@@ -37,7 +42,7 @@ type coRvwActions = {
     pageNo: number,
     pageCnt: number,
     startYear: string,
-    endYear: string,
+    endYear: string
   ) => void;
   coMatRvwUpdate: (
     splyCd: string,
@@ -50,7 +55,7 @@ type coRvwActions = {
     startYear: string,
     endYear: string,
     sggCd: string,
-    dmdCoNm: string,
+    dmdCoNm: string
   ) => void;
   coMatRvwInqua: (
     pageNo: number,
@@ -65,7 +70,7 @@ const coMatInit = async (
   pageNo: number,
   pageCnt: number,
   startYear: string,
-  endYear: string,
+  endYear: string
 ) => {
   const url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
   const coMatRvwRes = await getFetch(fetchType.WR, url);
@@ -79,7 +84,7 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       pageNo: number,
       pageCnt: number,
       startYear: string,
-      endYear: string,
+      endYear: string
     ) => {
       const coMatRvwRes = await coMatInit(pageNo, pageCnt, startYear, endYear);
 
@@ -98,27 +103,29 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       data: DedMatUpdateType
     ) => {
       try {
-        const isUpdate = await putFectch(
+        const response = await putFectch(
           `/reuseFc/request/cst/${splyCd}/${dmdCd}`,
           data
         );
-        if(isUpdate){
-          toast.error("수요 매칭 검토 검토로 저장되었습니다.");
+        if (response.status === 200) {
+          toast.success("매칭 검토로 저장되었습니다.");
+          const coMatRvwRes = await coMatInit(
+            1,
+            10,
+            new Date().getFullYear().toString(),
+            new Date().getFullYear().toString()
+          );
+          return set((state: coRvwState) => ({
+            ...state,
+            coRvw: {
+              ...state.coRvw,
+              coMatRvwRes: coMatRvwRes,
+              init: false,
+            },
+          }));
+        } else {
+          toast.error("매칭 검토 저장에 실패했습니다.");
         }
-        const coMatRvwRes = coMatInit(
-          1,
-          10,
-          new Date().getFullYear().toString(),
-          new Date().getFullYear().toString(),
-        );
-        return set((state: coRvwState) => ({
-          ...state,
-          coRvw: {
-            ...state.coRvw,
-            init: false,
-            coMatRvwRes: coMatRvwRes,
-          },
-        }));
       } catch (e) {
         toast.error("매칭 검토 저장 오류입니다.");
       }
@@ -129,7 +136,7 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       startYear: string,
       endYear: string,
       sggCd: string,
-      dmdCoNm: string,
+      dmdCoNm: string
     ) => {
       let url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
 
@@ -144,7 +151,7 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
         url += `/0`;
       }
 
-      console.log(' url ', url)
+      console.log(" url ", url);
       const coMatRvwRes = await getFetch(fetchType.WR, url);
 
       return set((state: coRvwState) => ({
@@ -166,7 +173,7 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
         let url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
         if (sggCd.length > 0) {
           url += `/${sggCd}/0`;
-        }else if(sggCd ==='0'){
+        } else if (sggCd === "0") {
           url += `/0/0`;
         }
         const coMatRvwRes = await getFetch(fetchType.WR, url);
@@ -180,6 +187,6 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       } catch (e) {
         console.log(" error ", e);
       }
-    } 
+    },
   };
 };
diff --git a/apps/wr/app/store/matDmd/coMatRvw/type.tsx b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
index 979e24d55..9b2e65cc4 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/type.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
@@ -1,157 +1,147 @@
 import { z } from "zod";
 
-  const DemandInfoSchema = z.object({
-    dmdInfoSn: z.number().nullish(),
-    dmdInfoFk: z.string().nullish(),
-    dmndTmng: z.coerce.date().nullish(),
-    dmndQty: z.number().nullish(),
-    wntUntprc: z.number().nullish(),
-    grssClfg: z.number().nullish(),
-    combResdch: z.number().nullish(),
-    trbt: z.number().nullish(),
-    blgcOxygDmndQnt: z.number(),
-    smll: z.number().nullish(),
-    crmty: z.number().nullish(),
-    tn: z.number().nullish(),
-    tph: z.number().nullish(),
-    ph: z.number(),
-    clIonQnt: z.number().nullish(),
-    cdtnv: z.number().nullish(),
-    rmrk: z.string().nullish(),
-    useUsgCd: z.string().nullish(),
-    mtchnCmptnYmd: z.string().nullish(),
-    rvwCmptnYmd: z.string().nullish()
-  });
-  
-  const DemandMatchingSchema = z.object({
-    dmdInfoFk: z.string().nullish(),
-    splyFcltFk: z.string().nullish(),
-    splyFcltFlg: z.string().nullish(),
-    pbnstRuseFcltBizFk: z.number().nullish(),
-    splyBgngDay: z.coerce.date().nullish(),
-    splyEndDay: z.coerce.date().nullish(),
-    splyCpct: z.number().nullish(),
-    splyFmYn: z.string().nullish(),
-    useUsgCd: z.string().nullish(),
-    dmdInfoSn: z.number().nullish(),
-    splyCndtList:z.array(z.string().nullish() ).nullish()
-  });
-  
-  const DemandCoSchema = z.object({
-    dmdInfoPk: z.string().nullish(),
-    dmdCoNm: z.string().nullish(),
-    ctpvCd: z.string().nullish(),
-    sggCd: z.string().nullish(),
-    daddr: z.string().nullish(),
-    splyBgngDay: z.coerce.date().nullish(),
-    splyEndDay: z.coerce.date().nullish(),
-    splyCpct: z.number().nullish(),
-    splyFmYn: z.string().nullish(),
-    telno: z.string().nullish(),
-    useUsgCd: z.string().nullish(),
-    regDt: z.coerce.date().nullish(),
-    rgtr: z.string().nullish(),
-    mdfcnDt: z.coerce.date().nullish(),
-    mdfr: z.string().nullish(),
-    dmdAplyPswd: z.string().nullish(),
-    demandInfo: z.array(DemandInfoSchema.nullish()).nullish(), // 안쓰는 거임
-    demandMatchings: z.array(DemandMatchingSchema.nullish()).nullish()// 안쓰는 거임
-  });
-  
-  const DemandCstSchema = z.object({
-    dmdInfoSn: z.number().nullish(),
-    usgPrcsProcs: z.string().nullish(),
-    cstrnCst: z.number(),
-    fcltSbsdCstrnCst: z.number(),
-    prcsFcltCpctCstrnCst: z.number()
-  });
-  
-  export const DmdCoReqSchema = z.object({
-    cityText:z.string().nullish(),
-    sggText:z.string().nullish(),
-    dmdInfoSn: z.number().nullish(),
-    dmdInfoFk: z.string().nullish(),
-    dmndTmng: z.coerce.date().nullish(),
-    dmndQty: z.number(),
-    wntUntprc: z.number().nullish(),
-    grssClfg: z.number().nullish(),
-    combResdch: z.number().nullish(),
-    trbt: z.number().nullish(),
-    blgcOxygDmndQnt: z.number(),
-    smll: z.number().nullish(),
-    crmty: z.number().nullish(),
-    tn: z.number().nullish(),
-    tph: z.number().nullish(),
-    ph: z.number().nullish(),
-    clIonQnt: z.number().nullish(),
-    cdtnv: z.number(),
-    rmrk: z.string().nullish(),
-    useUsgCd: z.string().nullish(),
-    mtchnCmptnYmd: z.string().nullish(),
-    rvwCmptnYmd: z.string().nullish(),
-    demandCo: DemandCoSchema.nullish(),
-    demandMatching: DemandMatchingSchema.nullish(),
-    demandCst: DemandCstSchema,
-    ruseUtztnFcltNm:z.string().nullish(),
-    totalConstCost:z.number().nullish(),
+const DemandInfoSchema = z.object({
+  dmdInfoSn: z.number(),
+  dmdInfoFk: z.string().nullish(),
+  dmndTmng: z.coerce.date().nullish(),
+  dmndQty: z.number().nullish(),
+  wntUntprc: z.number().nullish(),
+  grssClfg: z.number().nullish(),
+  combResdch: z.number().nullish(),
+  trbt: z.number().nullish(),
+  blgcOxygDmndQnt: z.number(),
+  smll: z.number().nullish(),
+  crmty: z.number().nullish(),
+  tn: z.number().nullish(),
+  tph: z.number().nullish(),
+  ph: z.number(),
+  clIonQnt: z.number().nullish(),
+  cdtnv: z.number().nullish(),
+  rmrk: z.string().nullish(),
+  useUsgCd: z.string().nullish(),
+  mtchnCmptnYmd: z.string().nullish(),
+  rvwCmptnYmd: z.string().nullish(),
+});
 
-  });
+const DemandMatchingSchema = z.object({
+  dmdInfoFk: z.string().nullish(),
+  splyFcltFk: z.string().nullish(),
+  splyFcltFlg: z.string().nullish(),
+  pbnstRuseFcltBizFk: z.number().nullish(),
+  splyBgngDay: z.coerce.date().nullish(),
+  splyEndDay: z.coerce.date().nullish(),
+  splyCpct: z.number().nullish(),
+  splyFmYn: z.string().nullish(),
+  useUsgCd: z.string().nullish(),
+  dmdInfoSn: z.number().nullish(),
+  splyCndtList: z.array(z.string().nullish()).nullish(),
+});
 
+const DemandCoSchema = z.object({
+  dmdInfoPk: z.string().nullish(),
+  dmdCoNm: z.string().nullish(),
+  ctpvCd: z.string().nullish(),
+  sggCd: z.string().nullish(),
+  daddr: z.string().nullish(),
+  splyBgngDay: z.coerce.date().nullish(),
+  splyEndDay: z.coerce.date().nullish(),
+  splyCpct: z.number().nullish(),
+  splyFmYn: z.string().nullish(),
+  telno: z.string().nullish(),
+  useUsgCd: z.string().nullish(),
+  regDt: z.coerce.date().nullish(),
+  rgtr: z.string().nullish(),
+  mdfcnDt: z.coerce.date().nullish(),
+  mdfr: z.string().nullish(),
+  dmdAplyPswd: z.string().nullish(),
+  demandInfo: z.array(DemandInfoSchema.nullish()).nullish(), // 안쓰는 거임
+  demandMatchings: z.array(DemandMatchingSchema.nullish()).nullish(), // 안쓰는 거임
+});
+
+const DemandCstSchema = z.object({
+  dmdInfoSn: z.number().nullish(),
+  usgPrcsProcs: z.string().nullish(),
+  cstrnCst: z.number().default(0),
+  fcltSbsdCstrnCst: z.number().default(0),
+  prcsFcltCpctCstrnCst: z.number().default(0),
+});
+
+export const DmdCoReqSchema = z.object({
+  cityText: z.string().nullish(),
+  sggText: z.string().nullish(),
+  dmdInfoSn: z.number().default(0),
+  dmdInfoFk: z.string().default(''),
+  dmndTmng: z.coerce.date().nullish(),
+  dmndQty: z.number().nullish(), // null 또는 undefined 허용
+  blgcOxygDmndQnt: z.number().nullish(),
+  wntUntprc: z.number().nullish(),
+  grssClfg: z.number().nullish(),
+  combResdch: z.number().nullish(),
+  trbt: z.number().nullish(),
+  smll: z.number().nullish(),
+  crmty: z.number().nullish(),
+  tn: z.number().nullish(),
+  tph: z.number().nullish(),
+  ph: z.number().nullish(),
+  clIonQnt: z.number().nullish(),
+  cdtnv: z.number().nullish(),
+  rmrk: z.string().nullish(),
+  useUsgCd: z.string().nullish(),
+  mtchnCmptnYmd: z.string().nullish(),
+  rvwCmptnYmd: z.string().nullish(),
+  demandCo: DemandCoSchema.nullish(),
+  demandMatching: DemandMatchingSchema.nullish(),
+  demandCst: DemandCstSchema.nullish(),
+  ruseUtztnFcltNm: z.string().nullish(),
+  totalConstCost: z.number().nullish(),
+});
 
 export type DmdCoReqType = z.infer<typeof DmdCoReqSchema>;
 export type DmdMatTableType = {
-    cityText:string,
-    sggText:string,
-    dmdCoNm:string,
-    daddr:string,
-    telno:string,
-    regDt:string,
-    splyFcltFlg:string
-}
+  cityText: string;
+  sggText: string;
+  dmdCoNm: string;
+  daddr: string;
+  telno: string;
+  regDt: string;
+  splyFcltFlg: string;
+};
 
-
-export type  DedMatUpdateType =
-{
+export type DedMatUpdateType = {
   dmdInfoSn: number;
   usgPrcsProcs: string;
   cstrnCst: number;
   fcltSbsdCstrnCst: number;
   prcsFcltCpctCstrnCst: number;
   rgtr: string;
-}
-
+};
 
 export type RvwHistTableType = {
-  cityText:string,
-  sggText:string,
-  dmdCoNm:string,
-  daddr:string,
-  telno:string,
-  regDt:string,
-  rvwCmptnYmd:string,
-  mtchnCmptnYmd:string,
-  ruseUtztnFcltNm:string,
-  dmndQty:string,
-  useUsgCd:string,
-  splyFcltFlg:string
-  completeYn:boolean
-  dmdInfoSn	:string
+  cityText: string;
+  sggText: string;
+  dmdCoNm: string;
+  daddr: string;
+  telno: string;
+  regDt: string;
+  rvwCmptnYmd: string;
+  mtchnCmptnYmd: string;
+  ruseUtztnFcltNm: string;
+  dmndQty: string;
+  useUsgCd: string;
+  splyFcltFlg: string;
+  completeYn: boolean;
+  dmdInfoSn: string;
+};
 
-}
-
-
-
-
-
-export type conCostFeeType= {
-  yr: string,
-  fctCpc: string,
-  fctCd: string,
-  stdCost: string
-}
+export type conCostFeeType = {
+  yr: string;
+  fctCpc: string;
+  fctCd: string;
+  stdCost: string;
+};
 export type rateFeeType = {
-  yr: string,
-  incExpCd: string,
-  stdCost: number,
-  rt: number
-}
\ No newline at end of file
+  yr: string;
+  incExpCd: string;
+  stdCost: number;
+  rt: number;
+};
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index 2653f4be9..f50474d79 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -74,14 +74,19 @@ export default function ConCostForm({
   const cstrnCst = form.watch("demandCst.cstrnCst");
   const useUsgCdWatch = form.watch("useUsgCd");
 
-  useEffect(() =>{
-    console.log('usgPrcsProcsWatch ', usgPrcsProcsWatch)
+  
 
-    console.log('useUsgCdWatch ' , useUsgCdWatch)
-
-  },[usgPrcsProcsWatch, useUsgCdWatch, selectionVersion])
   const calculateConstCost = useCallback(() => {
     const usgPrcsProcs = usgPrcsProcsWatch;
+    if(!dmndQtyWatch){
+       toast.error('요구수량(M3/d)을 확인해주세요 계산할수 없습니다. ')
+       return
+    }
+    if(usgPrcsProcs === null || usgPrcsProcs === undefined){
+      toast.error('용도에 따른 처리공정을 확인할수 없습니다. 용도를 확인해주세요. ')
+      return
+   }
+
     const dmndQtyYear = dmndQtyWatch * 365;
     if (usgPrcsProcs && usgPrcsProcs?.length > 0) {
       const firstProc =   getConstFctCode(usgPrcsProcs?.split("+")[0] || "") || "";
@@ -131,20 +136,23 @@ export default function ConCostForm({
   }, [constCostRes, rateFeeRes, usgPrcsProcsWatch, dmndQtyWatch]);
   const onSubmit = (value: DmdCoReqType) => {
 
-    if( !form.getValues('demandCst.prcsFcltCpctCstrnCst')  ){
+    if(value.demandCst&& !value.demandCst.prcsFcltCpctCstrnCst  ){
       toast.error('공사비 계산 진행 후 저장을 눌러주새요')
       return  
     }
     if (type === "mat") {
-      const data: DedMatUpdateType = {
-        dmdInfoSn: form.getValues("dmdInfoSn"),
-        usgPrcsProcs: form.getValues("demandCst.usgPrcsProcs")|| "",
-        cstrnCst: form.getValues("demandCst.cstrnCst"),
-        fcltSbsdCstrnCst: form.getValues("demandCst.fcltSbsdCstrnCst"),
-        prcsFcltCpctCstrnCst: form.getValues("demandCst.prcsFcltCpctCstrnCst"),
-        rgtr: TEST_UUID,
-      };
-  coMatRvwUpdate("11000SW001R1", form.getValues("dmdInfoFk"), data);
+
+      if(value.demandCst ){
+        const data: DedMatUpdateType = {
+          dmdInfoSn: value.dmdInfoSn,
+          usgPrcsProcs: value.demandCst.usgPrcsProcs|| "",
+          cstrnCst: value.demandCst.cstrnCst ||0,
+          fcltSbsdCstrnCst: value.demandCst.fcltSbsdCstrnCst ||0,
+          prcsFcltCpctCstrnCst: value.demandCst.prcsFcltCpctCstrnCst ||0,
+          rgtr: TEST_UUID,
+        };
+         coMatRvwUpdate("11000SW001R1", form.getValues("dmdInfoFk"), data);
+      }
     } else if (type === "hist") {
 
        delete  value.totalConstCost
@@ -159,6 +167,13 @@ export default function ConCostForm({
      console.log(" form  ", form.formState.errors);
   }, [form.formState]);
 
+
+  useEffect(() => {
+    form.register("dmdInfoSn");
+    form.register("dmdInfoFk");
+    form.register("ruseUtztnFcltNm");
+  }, []);
+
   return (
     <>
       <hr className="mt-8" />

From ad7b78688f79da1cc4ba77990ef7620f5caf8648 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 16:34:47 +0900
Subject: [PATCH 40/44] =?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]=20onVild=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0?=
 =?UTF-8?q?=EB=A1=9C=20=EB=AA=A8=EB=8B=AC=EC=97=90=EA=B2=8C=20=EB=84=98?=
 =?UTF-8?q?=EA=B2=A8=EC=A3=BC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ruseFcltMng/fcltReg/pbnstReg/page.tsx |   8 +-
 .../ruseFcltMng/fcltReg/pbnstReg/type.tsx     |   2 +-
 .../fcltReg/pbnstRegModal/pbnstRegModal.tsx   | 104 +++++++++---------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index 0c3ad9dce..9f243627c 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -200,14 +200,10 @@ export default function PublicReuseFaciltyInsert() {
   useEffect(() => {
     if (pbnst.pbnstRes && pbnst.pbnstRes?.length > 0) {
 
-      // form.reset({
-      //   items: pbnstRegArrayZod.parse(pbnst.pbnstRes),
-      // });
+      
 
       form.reset({ items: pbnst.pbnstRes });
 
-            //form.reset({ items: pbnst.pbnstRes });
-
     } else {
       form.reset({ items: [] });
     }
@@ -425,6 +421,8 @@ export default function PublicReuseFaciltyInsert() {
                     setIsRuseReg({ isModal: false });
                   }
                 }}
+
+                onInvalid ={onInvalid}
               ></PbnstRegModal>
             }
             bodyClass="w-[68vw] max-w-none h-[90vh]"
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
index 2ef1c6d2f..ad3496a54 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx
@@ -163,7 +163,7 @@ export const fcBizSchema = z.object({
   etc: z.string().default(""),
   totalMoney: zNumNullish.default(0),
   rprcsFcltCpct: zNumDefaultZero,
-  majorPrcsMsrcCd: z.string().default(""),
+  majorPrcsMsrcCd: z.string().nullish(),
   addr: z.string().default(""),
   rprcsMthdCd: z.string().default(""),
   inoutYn: z.enum(["Y", "N"]).default("Y"),
diff --git a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
index 34bc71a46..846e427c6 100644
--- a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
@@ -29,9 +29,11 @@ import type { z } from "zod";
 export function PbnstRegModal({
   form,
   setPbnstInsert,
+  onInvalid
 }: {
   form: UseFormReturn<{ items: PbnstRegArrrayType }>;
   setPbnstInsert: (data: customPbnst) => void;
+  onInvalid:(errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>) => void
 }) {
   const { pbnstInsert } = useWrStore((state) => {
     return state;
@@ -51,69 +53,69 @@ export function PbnstRegModal({
        setPbnstInsert(data[0]);
      }
    };
-  const onInvalid = (
-    errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>
-  ) => {
-    // 재귀 함수를 사용해 중첩된 에러 객체에서 모든 에러 메시지와 경로를 찾습니다.
+  // const onInvalid = (
+  //   errors: FieldErrors<{ items: z.infer<typeof pbnstRegZod>[] }>
+  // ) => {
+  //   // 재귀 함수를 사용해 중첩된 에러 객체에서 모든 에러 메시지와 경로를 찾습니다.
   
 
-    const findAllErrors = (
-      errorObject: any,
-      path: (string | number)[] = []
-    ): { message: string; path: (string | number)[] }[] => {
-      if (!errorObject) return [];
+  //   const findAllErrors = (
+  //     errorObject: any,
+  //     path: (string | number)[] = []
+  //   ): { message: string; path: (string | number)[] }[] => {
+  //     if (!errorObject) return [];
 
-      return Object.keys(errorObject).flatMap((key) => {
-        const value = errorObject[key];
-        const currentKey = !isNaN(parseInt(key)) ? parseInt(key) : key;
-        const newPath = [...path, currentKey];
-        if (value && typeof value === "object") {
-          if (typeof value.message === "string") {
-            return [{ message: value.message, path: newPath }]; // 에러 메시지와 경로 반환
-          }
-          return findAllErrors(value, newPath);
-        }
-        return [];
-      });
-    };
+  //     return Object.keys(errorObject).flatMap((key) => {
+  //       const value = errorObject[key];
+  //       const currentKey = !isNaN(parseInt(key)) ? parseInt(key) : key;
+  //       const newPath = [...path, currentKey];
+  //       if (value && typeof value === "object") {
+  //         if (typeof value.message === "string") {
+  //           return [{ message: value.message, path: newPath }]; // 에러 메시지와 경로 반환
+  //         }
+  //         return findAllErrors(value, newPath);
+  //       }
+  //       return [];
+  //     });
+  //   };
 
 
-    const errorList = findAllErrors(errors);
+  //   const errorList = findAllErrors(errors);
 
 
-    if (errorList.length > 0) {
-      errorList.forEach((errorInfo) => {
-        const { message, path } = errorInfo;
-        let prefix = "";
-        const itemsIndex = path.indexOf("items");
+  //   if (errorList.length > 0) {
+  //     errorList.forEach((errorInfo) => {
+  //       const { message, path } = errorInfo;
+  //       let prefix = "";
+  //       const itemsIndex = path.indexOf("items");
 
 
-        if (itemsIndex > -1 && path.length > itemsIndex + 1) {
-          const itemIdx = path[itemsIndex + 1] as number;
-          const facilityName = form.getValues(
-            `items.${itemIdx}.ruseUtztnFcltNm`
-          );
-          if (facilityName) {
-            prefix += `[${facilityName}] `;
-          }
+  //       if (itemsIndex > -1 && path.length > itemsIndex + 1) {
+  //         const itemIdx = path[itemsIndex + 1] as number;
+  //         const facilityName = form.getValues(
+  //           `items.${itemIdx}.ruseUtztnFcltNm`
+  //         );
+  //         if (facilityName) {
+  //           prefix += `[${facilityName}] `;
+  //         }
 
-          const fcBizsIndex = path.indexOf("fcBizs");
-          if (fcBizsIndex > -1 && path.length > fcBizsIndex + 1) {
-            const bizIdx = path[fcBizsIndex + 1] as number;
-            const cycle = form.getValues(
-              `items.${itemIdx}.fcBizs.${bizIdx}.cycl`
-            );
-            if (cycle) {
-              prefix += `[${cycle}차수] `;
-            }
-          }
-        }
+  //         const fcBizsIndex = path.indexOf("fcBizs");
+  //         if (fcBizsIndex > -1 && path.length > fcBizsIndex + 1) {
+  //           const bizIdx = path[fcBizsIndex + 1] as number;
+  //           const cycle = form.getValues(
+  //             `items.${itemIdx}.fcBizs.${bizIdx}.cycl`
+  //           );
+  //           if (cycle) {
+  //             prefix += `[${cycle}차수] `;
+  //           }
+  //         }
+  //       }
 
 
-        toast.error(`${prefix}${message}`);
-      });
-    }
-  };
+  //       toast.error(`${prefix}${message}`);
+  //     });
+  //   }
+  // };
 
   const handleTabChange = (value: string) => {
     setCurrentTab(value);

From 59a517583201fffc28426cd3350220583955c2f4 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 17:20:21 +0900
Subject: [PATCH 41/44] =?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=EC=85=80=EB=A0=89=ED=8A=B8?=
 =?UTF-8?q?=EB=B0=95=EC=8A=A4=20=EC=84=A0=ED=83=9D=EB=90=98=EA=B2=8C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
index fb50e1b89..234efa7c7 100644
--- a/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
+++ b/apps/wr/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegFormDetail/mngRegFormDetail.tsx
@@ -101,7 +101,7 @@ export default function MngRegFormDetail({
                                 : []
                             }
                             onSelectValue={field.onChange}
-                            value={field.value?.trim() ??""}
+                            value={field.value?.trim() ?? (Array.isArray(potentialOptions) && potentialOptions[0]?.val )}
                             readOnly={formHead.option === "readOnly"}
                           />
                         );

From d2c7bbb78bed1d6c094f007d7aa3eb18f5a2412a Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 18:30:07 +0900
Subject: [PATCH 42/44] =?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=9B=90?=
 =?UTF-8?q?=EC=88=98=EC=B7=A8=EC=88=98=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/store/common/searchCode/index.ts       |  1 +
 .../fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/wr/app/store/common/searchCode/index.ts b/apps/wr/app/store/common/searchCode/index.ts
index 893e6ee10..656bc33d9 100644
--- a/apps/wr/app/store/common/searchCode/index.ts
+++ b/apps/wr/app/store/common/searchCode/index.ts
@@ -70,6 +70,7 @@ export type comFcltState = {
 export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
   return {
     getSwtrmtFcltNm: async (searchNm: string) => {
+
       const fcltNm = await getFetch(
         "common",
         `/prcsFclt/info/1/11/${searchNm}`
diff --git a/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
index 69ec1afcc..5b1a6f0f6 100644
--- a/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/fcOrgwtsRegModal/fcOrgwtsRegModal.tsx
@@ -115,7 +115,19 @@ export default function FcOrgwtsRegModal({
               value={inputVal}
               onChange={(e) => setInputVal(e.target.value)}
             />
-            <Button size="sm" onClick={() => getSwtrmtFcltNm(inputVal)}>
+            <Button size="sm" onClick={() => {
+
+              if(inputVal){
+
+                getSwtrmtFcltNm(inputVal)
+              }else{
+                const filterData = pbnstHasuRes.filter((item) => ! rightData?.find(( right) => right.bscFctNm ===item.bscFctNm))
+                setbdstTable(tableData(filterData, { code }));
+
+              }
+            }
+              
+              }>
               조회
             </Button>
             <Button size="sm" onClick={saveData}>저장</Button>

From e332162984c445ceca02129d692be4ebcd2cc10b Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 22:44:31 +0900
Subject: [PATCH 43/44] =?UTF-8?q?=EC=88=98=EC=9A=94=EB=A7=A4=EC=B9=AD=20?=
 =?UTF-8?q?=EA=B2=80=ED=86=A0=20=EB=B0=8F=20=EC=9D=B4=EB=A0=A5=20=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/matMng/coMat/coMatRvw/page.tsx    |   4 +-
 .../wr/app/matMng/coMat/ruseRvwHstry/page.tsx |  98 ++++++++-----
 apps/wr/app/store/matDmd/coMatRvw/index.tsx   |  28 ++--
 apps/wr/app/store/matDmd/coMatRvw/type.tsx    |   5 +-
 .../store/matDmd/ruseRvwHstry/headList.tsx    |   2 +-
 .../app/store/matDmd/ruseRvwHstry/index.tsx   |  39 +++--
 apps/wr/components/lib/func/commom.tsx        |   5 +-
 .../ui/form/coMat/conCostForm/conCostForm.tsx | 133 +++++++++++-------
 8 files changed, 191 insertions(+), 123 deletions(-)

diff --git a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
index 0bb06770a..15bff0b32 100644
--- a/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
+++ b/apps/wr/app/matMng/coMat/coMatRvw/page.tsx
@@ -46,7 +46,7 @@ import type { objSearchType } from "@/components/ui/modal/fcltReg/bdstRegModal/b
 export default function CoMatRvw() {
   const { code, coRvw, coMatRvwInit, coMatRvwSearch, coMatRvwInqua } =
     useWrStore((state) => state);
-  const { coMatRvwRes } = coRvw;
+  const { coMatRvwRes,coMatRvwCount } = coRvw;
   //init, sub, match
   const initRef = useRef<boolean>(false);
   const { coRvwHeadList } = coRvw;
@@ -276,7 +276,7 @@ export default function CoMatRvw() {
                 tableData={dmdMatData || []}
                 headlist={coRvwHeadList}
                 pageSize={20}
-                total={100000}
+                total={coMatRvwCount}
                 cellClick={(index: number | undefined, headId: string) => {
                   if (index !== undefined && index >= 0) {
                     TableCellClick(index);
diff --git a/apps/wr/app/matMng/coMat/ruseRvwHstry/page.tsx b/apps/wr/app/matMng/coMat/ruseRvwHstry/page.tsx
index 2d339b869..d0a6bcb93 100644
--- a/apps/wr/app/matMng/coMat/ruseRvwHstry/page.tsx
+++ b/apps/wr/app/matMng/coMat/ruseRvwHstry/page.tsx
@@ -7,6 +7,7 @@ import {
   type RvwHistTableType,
 } from "@/app/store/matDmd/coMatRvw/type";
 import {
+  formatPhoneNumber,
   getCity,
   getdmdMatFlag,
   yearOptions,
@@ -43,7 +44,7 @@ export default function RuseRvwHstry() {
     ruseRvwInqua,
     ruseRvwComplete,
   } = useWrStore((state) => state);
-  const { rvwHistRes, ruseHistHeadList } = ruseHist;
+  const { rvwHistRes, ruseHistHeadList,rvwHistCount } = ruseHist;
   const [pageNation, setPageNatiion] = useState<number>(1);
 
   const [dmdCoNm, setDmdCoNm] = useState<string>("");
@@ -69,6 +70,36 @@ export default function RuseRvwHstry() {
     setObjSearch({ city: cityValue, sgg: "0" });
   };
 
+  useEffect(() =>{
+    getButtonSearch()
+  },[pageNation])
+
+  const getButtonSearch=()=>{
+    if (fromDate && toDate) {
+      const fromNum = Number(fromDate);
+      const toNum = Number(toDate);
+      if (fromNum > toNum) {
+        toast.error(
+          "시작년도가 종료년도 이후로 설정할 수 없습니다."
+        );
+      } else {
+        let con: string | number = "";
+        if (String(objSearch.city).length > 0) {
+          con = String(objSearch.city);
+        }
+        if (String(objSearch.sgg).length > 0 && objSearch.sgg !== "0") {
+          con = String(objSearch.sgg);
+        }
+        getSearch(
+          fromNum,
+          toNum,
+          con,
+          dmdCoNm,
+          ruseUtztnFcltNm
+        );
+      }
+    }
+  }
   const getSgg = (val: string | number) => {
     console.log(val);
     setObjSearch({ ...objSearch, sgg: String(val) });
@@ -163,23 +194,29 @@ export default function RuseRvwHstry() {
       const data = rvwHistRes?.map((item, index) => {
         let flag = "";
           flag = getdmdMatFlag(item.demandMatching?.splyFcltFlg ?? "");
-
+          const formatDate = (dateStr: string | null | undefined) => {
+            // null, undefined, 빈 문자열인 경우 '없음'을 반환합니다.
+            if (!dateStr) return "없음";
+            // "YYYYMMDD" 형식으로 날짜를 파싱합니다.
+            const d = moment(dateStr, "YYYYMMDD");
+            // 파싱된 날짜가 유효한 경우에만 포맷하고, 그렇지 않으면 '없음'을 반환합니다.
+            return d.isValid() ? d.format("YYYY-MM-DD") : "없음";
+          };
+       
         return {
           ...item,
           ctpvCd: item.demandCo?.ctpvCd,
           sggCd: item.demandCo?.sggCd,
           dmdCoNm: item.demandCo?.dmdCoNm,
           daddr: item.demandCo?.daddr,
-          telno: item.demandCo?.telno,
-          regDt: item?.demandCo?.regDt
-            ? moment(item?.demandCo?.regDt).format("YYYY-MM-DD")
-            : "없음",
-          rvwCmptnYmd: item?.rvwCmptnYmd
-            ? moment(item?.rvwCmptnYmd).format("YYYY-MM-DD")
-            : "없음",
-          mtchnCmptnYmd: item?.mtchnCmptnYmd
-            ? moment(item?.mtchnCmptnYmd).format("YYYY-MM-DD")
+          telno: formatPhoneNumber(item.demandCo?.telno ||''),
+          dmndTmng: item?.dmndTmng
+            ? moment(item?.dmndTmng).format("YYYY-MM-DD")
             : "없음",
+
+            rvwCmptnYmd: formatDate(item.demandMatching?.rvwCmptnYmd),
+            mtchnCmptnYmd: formatDate(item.demandMatching?.mtchnCmptnYmd),
+            
             ruseUtztnFcltNm: item.ruseUtztnFcltNm,
           dmndQty: item.dmndQty,
           splyFcltFlg: flag,
@@ -272,30 +309,7 @@ export default function RuseRvwHstry() {
                   <Button
                     size={"sm"}
                     onClick={(e) => {
-                      if (fromDate && toDate) {
-                        const fromNum = Number(fromDate);
-                        const toNum = Number(toDate);
-                        if (fromNum > toNum) {
-                          toast.error(
-                            "시작년도가 종료년도 이후로 설정할 수 없습니다."
-                          );
-                        } else {
-                          let con: string | number = "";
-                          if (String(objSearch.city).length > 0) {
-                            con = String(objSearch.city);
-                          }
-                          if (String(objSearch.sgg).length > 0 && objSearch.sgg !== "0") {
-                            con = String(objSearch.sgg);
-                          }
-                          getSearch(
-                            fromNum,
-                            toNum,
-                            con,
-                            dmdCoNm,
-                            ruseUtztnFcltNm
-                          );
-                        }
-                      }
+                      getButtonSearch()
                     }}
                   >
                     조회
@@ -318,17 +332,23 @@ export default function RuseRvwHstry() {
               tableData={rvwHistData || []}
               headlist={ruseHistHeadList}
               pageSize={20}
-              total={100000}
+              total={rvwHistCount}
               cellClick={(index: number | undefined, headId: string) => {
                 TableCellClick(index);
               }}
-              onPageChange={setPageNatiion}
+              onPageChange={
+                (page)=>{
+                  setPageNatiion(page)
+               
+                }
+                
+                }
             ></UiTable>
-            <hr />
+            {/* <hr />
             <h3 className="mt-4 ml-2 text-2xl font-medium text-label">
               수요신청 상세현황
             </h3>
-            <ConCostForm form={form} type={"hist"} />
+            <ConCostForm form={form} type={"hist"} selectionVersion={0} /> */}
           </ListDiv>
         </div>
       </div>
diff --git a/apps/wr/app/store/matDmd/coMatRvw/index.tsx b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
index a1a7c187d..e683b548e 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/index.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
@@ -6,7 +6,7 @@ import {
 } from "./headList";
 import type { CommonTableProps } from "../../common/type/header";
 import type { DedMatUpdateType, DmdCoReqType } from "./type";
-import { fetchType, getFetch, putFectch } from "@/components/lib/api";
+import { fetchType, getFetch, getFetchWithCount, putFectch } from "@/components/lib/api";
 import toast from "react-hot-toast";
 
 const coRvwHeadList = coRvwHeadListExport;
@@ -21,6 +21,7 @@ export type coRvwState = {
     coRvwNodeList: CommonTableProps[];
     rateFeeHeadList: CommonTableProps[];
     constCostHeadList: CommonTableProps[];
+    coMatRvwCount:number;
   };
 };
 
@@ -32,6 +33,7 @@ export const coRvwStateExport: coRvwState = {
     coRvwNodeList: coRvwNodeList,
     rateFeeHeadList: rateFeeHeadList,
     constCostHeadList: constCostHeadList,
+    coMatRvwCount:1
   },
 };
 
@@ -72,8 +74,8 @@ const coMatInit = async (
   startYear: string,
   endYear: string
 ) => {
-  const url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
-  const coMatRvwRes = await getFetch(fetchType.WR, url);
+  const url = `/reuseFc/request/infoList/Sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+  const coMatRvwRes = await getFetchWithCount(fetchType.WR, url);
 
   return coMatRvwRes;
 };
@@ -93,7 +95,8 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
         coRvw: {
           ...state.coRvw,
           init: false,
-          coMatRvwRes: coMatRvwRes,
+          coMatRvwRes: coMatRvwRes.data,
+          coMatRvwCount:coMatRvwRes.count
         },
       }));
     },
@@ -119,7 +122,8 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
             ...state,
             coRvw: {
               ...state.coRvw,
-              coMatRvwRes: coMatRvwRes,
+              coMatRvwRes: coMatRvwRes.data,
+          coMatRvwCount:coMatRvwRes.count,
               init: false,
             },
           }));
@@ -138,7 +142,7 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       sggCd: string,
       dmdCoNm: string
     ) => {
-      let url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+      let url = `/reuseFc/request/infoList/Sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
 
       if (sggCd.length > 0) {
         url += `/${sggCd}`;
@@ -152,13 +156,14 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       }
 
       console.log(" url ", url);
-      const coMatRvwRes = await getFetch(fetchType.WR, url);
+      const coMatRvwRes = await getFetchWithCount(fetchType.WR, url);
 
       return set((state: coRvwState) => ({
         ...state,
         coRvw: {
           ...state.coRvw,
-          coMatRvwRes: coMatRvwRes,
+          coMatRvwRes: coMatRvwRes.data,
+          coMatRvwCount:coMatRvwRes.count,
         },
       }));
     },
@@ -170,18 +175,19 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
       sggCd: string
     ) => {
       try {
-        let url = `/reuseFc/request/infoList/sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+        let url = `/reuseFc/request/infoList/Sub/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
         if (sggCd.length > 0) {
           url += `/${sggCd}/0`;
         } else if (sggCd === "0") {
           url += `/0/0`;
         }
-        const coMatRvwRes = await getFetch(fetchType.WR, url);
+        const coMatRvwRes = await getFetchWithCount(fetchType.WR, url);
         return set((state: coRvwState) => ({
           ...state,
           coRvw: {
             ...state.coRvw,
-            coMatRvwRes: coMatRvwRes,
+            coMatRvwRes: coMatRvwRes.data,
+            coMatRvwCount:coMatRvwRes.count,
           },
         }));
       } catch (e) {
diff --git a/apps/wr/app/store/matDmd/coMatRvw/type.tsx b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
index 9b2e65cc4..2121c49fe 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/type.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/type.tsx
@@ -19,8 +19,6 @@ const DemandInfoSchema = z.object({
   cdtnv: z.number().nullish(),
   rmrk: z.string().nullish(),
   useUsgCd: z.string().nullish(),
-  mtchnCmptnYmd: z.string().nullish(),
-  rvwCmptnYmd: z.string().nullish(),
 });
 
 const DemandMatchingSchema = z.object({
@@ -35,6 +33,8 @@ const DemandMatchingSchema = z.object({
   useUsgCd: z.string().nullish(),
   dmdInfoSn: z.number().nullish(),
   splyCndtList: z.array(z.string().nullish()).nullish(),
+  mtchnCmptnYmd: z.string().nullish(),
+  rvwCmptnYmd: z.string().nullish(),
 });
 
 const DemandCoSchema = z.object({
@@ -114,6 +114,7 @@ export type DedMatUpdateType = {
   fcltSbsdCstrnCst: number;
   prcsFcltCpctCstrnCst: number;
   rgtr: string;
+  flg?:string;
 };
 
 export type RvwHistTableType = {
diff --git a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx
index 90c793c2f..a90f5831b 100644
--- a/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx
+++ b/apps/wr/app/store/matDmd/ruseRvwHstry/headList.tsx
@@ -28,7 +28,7 @@ export const ruseHstryHeadListExport:TableUpperProps[]= [
     visible: true,
   },
   {
-    id: "regDt", //바꾸기
+    id: "dmndTmng", //바꾸기
     title: "신청일자",
     visible: true,
   },
diff --git a/apps/wr/app/store/matDmd/ruseRvwHstry/index.tsx b/apps/wr/app/store/matDmd/ruseRvwHstry/index.tsx
index 3338bc467..cfd991b4d 100644
--- a/apps/wr/app/store/matDmd/ruseRvwHstry/index.tsx
+++ b/apps/wr/app/store/matDmd/ruseRvwHstry/index.tsx
@@ -5,7 +5,7 @@ import type {
   TableUpperProps,
 } from "../../common/type/header";
 import { ruseHstryHeadListExport } from "./headList";
-import { fetchType, getFetch, postFectch, putFectch } from "@/components/lib/api";
+import { fetchType, getFetch, getFetchWithCount, postFectch, putFectch } from "@/components/lib/api";
 import type { DmdCoReqType } from "../coMatRvw/type";
 import toast from "react-hot-toast";
 import { TEST_UUID } from "../../ruseFcltMng/fcltReg/rainReg";
@@ -16,6 +16,7 @@ export type ruseHstryState = {
   ruseHist: {
     isInit: boolean;
     rvwHistRes: DmdCoReqType[];
+    rvwHistCount:number;
     ruseHistHeadList: TableUpperProps[];
   };
 };
@@ -25,6 +26,7 @@ export const ruseHstryStateExport: ruseHstryState = {
     isInit: false,
     rvwHistRes: [],
     ruseHistHeadList: ruseHistHeadList,
+    rvwHistCount:1,
   },
 };
 
@@ -79,14 +81,14 @@ const irvwHistInit = async (
   startYear: string,
   endYear: string,
 ) => {
-  let url = `/reuseFc/request/infoList/matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+  let url = `/reuseFc/request/infoList/Matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
 
   // console.log("sggCd ", sggCd);
   // if (sggCd) {
   //   url += `/${sggCd}`;
   // }
 
-  const rvwHistRes = await getFetch(fetchType.WR, url);
+  const rvwHistRes = await getFetchWithCount(fetchType.WR, url);
 
   return rvwHistRes;
 };
@@ -115,7 +117,8 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
         ruseHist: {
           ...state.ruseHist,
           init: false,
-          rvwHistRes: rvwHistRes,
+          rvwHistRes: rvwHistRes.data,
+          rvwHistCount:rvwHistRes.count
         },
       }));
     },
@@ -140,8 +143,8 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
             ruseHist: {
               ...state.ruseHist,
               init: false,
-              rvwHistRes: rvwHistRes,
-            },
+              rvwHistRes: rvwHistRes.data,
+              rvwHistCount:rvwHistRes.count            },
           }));
         }
       } catch (e) {
@@ -158,7 +161,7 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
       dmdCoNm: string,
       ruseUtztnFcltNm: string
     ) => {
-      let url = `/reuseFc/request/infoList/matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+      let url = `/reuseFc/request/infoList/Matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
 
       if (sggCd.length > 0) {
         url += `/${sggCd}`;
@@ -175,14 +178,14 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
       } else {
         url += `/0`;
       }
-      const rvwHistRes = await getFetch(fetchType.WR, url);
+      const rvwHistRes = await getFetchWithCount(fetchType.WR, url);
 
       return set((state: ruseHstryState) => ({
         ...state,
         ruseHist: {
           ...state.ruseHist,
-          rvwHistRes: rvwHistRes,
-        },
+          rvwHistRes: rvwHistRes.data,
+          rvwHistCount:rvwHistRes.count        },
       }));
     },
     ruseRvwInqua: async (
@@ -193,16 +196,17 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
       sggCd: string
     ) => {
       try {
-        let url = `/reuseFc/request/infoList/matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
+        let url = `/reuseFc/request/infoList/Matched/${pageNo}/${pageCnt}/${startYear}/${endYear}`;
         if (sggCd.length > 0) {
           url += `/${sggCd}/0`;
         }
-        const rvwHistRes = await getFetch(fetchType.WR, url);
+        const rvwHistRes = await getFetchWithCount(fetchType.WR, url);
         return set((state: ruseHstryState) => ({
           ...state,
           ruseHist: {
             ...state.ruseHist,
-            rvwHistRes: rvwHistRes,
+            rvwHistRes: rvwHistRes.data,
+            rvwHistCount:rvwHistRes.count  
           },
         }));
       } catch (e) {
@@ -224,6 +228,15 @@ export const ruseHstryActionsExport: (set: any) => ruseHstryActions = (
             new Date().getFullYear().toString(),
             new Date().getFullYear().toString(),
           );
+
+          return set((state: ruseHstryState) => ({
+            ...state,
+            ruseHist: {
+              ...state.ruseHist,
+              rvwHistRes: rvwHistRes.data,
+              rvwHistCount:rvwHistRes.count  
+            },
+          }));
         }
       } catch (e) {
         console.log(" error ", e);
diff --git a/apps/wr/components/lib/func/commom.tsx b/apps/wr/components/lib/func/commom.tsx
index 6b253bdba..7d8c2ffcc 100644
--- a/apps/wr/components/lib/func/commom.tsx
+++ b/apps/wr/components/lib/func/commom.tsx
@@ -169,12 +169,13 @@ export const getdmdMatFlag = (flag: string | undefined | null) => {
   const cleanFlag = (flag ?? "").trim();
 
 
-  console.log('cleanFlag ', cleanFlag)
   switch (cleanFlag) {
     case "Sub":
       return "검토";
-    case "matched":
+    case "Matched":
       return "매칭완료";
+    case "Checked":
+    return '검토완료';
     default:
       return "신청";
   }
diff --git a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
index f50474d79..bb70cb7ec 100644
--- a/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
+++ b/apps/wr/components/ui/form/coMat/conCostForm/conCostForm.tsx
@@ -22,8 +22,7 @@ import {
   UiTable,
 } from "@common/business_components/ui";
 import PopoverUi from "@common/business_components/ui/popover_ui";
-import { Button, Input, Label } from "@common/components/ui";
-import type { read } from "fs";
+import { Button, Checkbox, Input, Label } from "@common/components/ui";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { type UseFormReturn } from "react-hook-form";
 import toast from "react-hot-toast";
@@ -48,6 +47,8 @@ export default function ConCostForm({
 
   const ref = useRef<boolean>(false);
 
+  const [checkFinish, setCheckFinish] = useState<boolean>(false);
+
   useEffect(() => {
     if (!ref.current) {
       const currentYear = new Date().getFullYear();
@@ -57,6 +58,13 @@ export default function ConCostForm({
     }
   }, [ref, getConstCostFee, getRateFee]);
 
+
+  useEffect(() => {
+    // 다른 행을 선택하면(selectionVersion 변경) 체크박스 상태를 초기화합니다.
+    setCheckFinish(false);
+  }, [selectionVersion]);
+
+
   const zipDowonLoad = () => {
     fetch(`/2024_constarctFeeProgram.zip`, {}).then(async (response) => {
       const blobRet = await response.blob();
@@ -74,36 +82,38 @@ export default function ConCostForm({
   const cstrnCst = form.watch("demandCst.cstrnCst");
   const useUsgCdWatch = form.watch("useUsgCd");
 
-  
-
   const calculateConstCost = useCallback(() => {
     const usgPrcsProcs = usgPrcsProcsWatch;
-    if(!dmndQtyWatch){
-       toast.error('요구수량(M3/d)을 확인해주세요 계산할수 없습니다. ')
-       return
+    if (!dmndQtyWatch) {
+      toast.error("요구수량(M3/d)을 확인해주세요 계산할수 없습니다. ");
+      return;
+    }
+    if (usgPrcsProcs === null || usgPrcsProcs === undefined) {
+      toast.error(
+        "용도에 따른 처리공정을 확인할수 없습니다. 용도를 확인해주세요. "
+      );
+      return;
     }
-    if(usgPrcsProcs === null || usgPrcsProcs === undefined){
-      toast.error('용도에 따른 처리공정을 확인할수 없습니다. 용도를 확인해주세요. ')
-      return
-   }
 
     const dmndQtyYear = dmndQtyWatch * 365;
     if (usgPrcsProcs && usgPrcsProcs?.length > 0) {
-      const firstProc =   getConstFctCode(usgPrcsProcs?.split("+")[0] || "") || "";
-      const secondProc =  getConstFctCode(usgPrcsProcs?.split("+")[1] || "") || "";
+      const firstProc =
+        getConstFctCode(usgPrcsProcs?.split("+")[0] || "") || "";
+      const secondProc =
+        getConstFctCode(usgPrcsProcs?.split("+")[1] || "") || "";
 
       const { lower: firstLower, upper: firstUpper } = findBounds(
         constCostRes,
         firstProc || "",
-        'fctCd',
-        'fctCpc',
+        "fctCd",
+        "fctCpc",
         Number(dmndQtyYear)
       );
       const { lower: secondLower, upper: secondUpper } = findBounds(
         constCostRes,
         secondProc || "",
-        'fctCd',
-        'fctCpc',
+        "fctCd",
+        "fctCpc",
         Number(dmndQtyYear)
       );
 
@@ -122,52 +132,56 @@ export default function ConCostForm({
       const groupCodes = ["BD", "CE", "SE", "WD"];
       const groupedBounds: { [key: string]: { lower?: any; upper?: any } } = {};
       for (const code of groupCodes) {
-        
-        groupedBounds[code] =  findBounds(rateFeeRes, code, 'incExpCd', 'stdCost',result);
+        groupedBounds[code] = findBounds(
+          rateFeeRes,
+          code,
+          "incExpCd",
+          "stdCost",
+          result
+        );
       }
       const resultRate = transformAndInterpolate(groupedBounds, result);
-      const fcltSbsdCstrnCst = (result* (resultRate.BD + resultRate.CE + resultRate.SE + resultRate.WD) / 100);
+      const fcltSbsdCstrnCst =
+        (result *
+          (resultRate.BD + resultRate.CE + resultRate.SE + resultRate.WD)) /
+        100;
       const realResult = result + fcltSbsdCstrnCst;
 
-      form.setValue("demandCst.prcsFcltCpctCstrnCst", Math.round(result) );
-      form.setValue("demandCst.fcltSbsdCstrnCst",  Math.round(fcltSbsdCstrnCst)) ;
-      form.setValue("totalConstCost",  Math.round(realResult));
+      form.setValue("demandCst.prcsFcltCpctCstrnCst", Math.round(result));
+      form.setValue("demandCst.fcltSbsdCstrnCst", Math.round(fcltSbsdCstrnCst));
+      form.setValue("totalConstCost", Math.round(realResult));
     }
   }, [constCostRes, rateFeeRes, usgPrcsProcsWatch, dmndQtyWatch]);
   const onSubmit = (value: DmdCoReqType) => {
-
-    if(value.demandCst&& !value.demandCst.prcsFcltCpctCstrnCst  ){
-      toast.error('공사비 계산 진행 후 저장을 눌러주새요')
-      return  
+    if (value.demandCst && !value.demandCst.prcsFcltCpctCstrnCst) {
+      toast.error("공사비 계산 진행 후 저장을 눌러주새요");
+      return;
     }
     if (type === "mat") {
-
-      if(value.demandCst ){
+      if (value.demandCst) {
         const data: DedMatUpdateType = {
           dmdInfoSn: value.dmdInfoSn,
-          usgPrcsProcs: value.demandCst.usgPrcsProcs|| "",
-          cstrnCst: value.demandCst.cstrnCst ||0,
-          fcltSbsdCstrnCst: value.demandCst.fcltSbsdCstrnCst ||0,
-          prcsFcltCpctCstrnCst: value.demandCst.prcsFcltCpctCstrnCst ||0,
+          usgPrcsProcs: value.demandCst.usgPrcsProcs || "",
+          cstrnCst: value.demandCst.cstrnCst || 0,
+          fcltSbsdCstrnCst: value.demandCst.fcltSbsdCstrnCst || 0,
+          prcsFcltCpctCstrnCst: value.demandCst.prcsFcltCpctCstrnCst || 0,
+          flg: checkFinish?'Checked':'Sub',
           rgtr: TEST_UUID,
         };
-         coMatRvwUpdate("11000SW001R1", form.getValues("dmdInfoFk"), data);
+        coMatRvwUpdate("11000SW001R1", form.getValues("dmdInfoFk"), data);
       }
     } else if (type === "hist") {
-
-       delete  value.totalConstCost
-       delete  value.ruseUtztnFcltNm
-
+      delete value.totalConstCost;
+      delete value.ruseUtztnFcltNm;
 
       ruseRvwCalUpdate(value);
     }
   };
 
   useEffect(() => {
-     console.log(" form  ", form.formState.errors);
+    console.log(" form  ", form.formState.errors);
   }, [form.formState]);
 
-
   useEffect(() => {
     form.register("dmdInfoSn");
     form.register("dmdInfoFk");
@@ -187,18 +201,30 @@ export default function ConCostForm({
           <Button className="mx-3" size={"sm"} onClick={calculateConstCost}>
             계산
           </Button>
-          <Button   className="mr-3" size={"sm"} onClick={form.handleSubmit(onSubmit)}>
+          <Button
+            className="mr-3"
+            size={"sm"}
+            onClick={form.handleSubmit(onSubmit)}
+          >
             저장
           </Button>
-            <Label>관로 표준공사비 산정 프로그램</Label>
-            <Button
-              color="green"
-              size={"sm"}
-              onClick={zipDowonLoad}
-              className="bg-none ml-6"
-            >
-              다운로드
-            </Button>
+          <Label>검토완료</Label>
+          <Checkbox
+            className="ml-3 mr-6"
+            checked={checkFinish}
+            onCheckedChange={(checked) =>
+              // 'indeterminate' 상태를 무시하고 순수 boolean 값으로만 상태를 업데이트합니다.
+              setCheckFinish(checked === true)}
+          ></Checkbox>
+          <Label>관로 표준공사비 산정 프로그램</Label>
+          <Button
+            color="green"
+            size={"sm"}
+            onClick={zipDowonLoad}
+            className="bg-none ml-6"
+          >
+            다운로드
+          </Button>
         </div>
         <div className="col-span-12 w-full">
           <h1 className={formH1Class}>기본사항</h1>
@@ -310,14 +336,14 @@ export default function ConCostForm({
             <h1 className={formH1Class}>공사비 입력사항</h1>
           </div>
 
-
           <div className="col-span-2 mt-4">
             <div className="flex items-center justify-between">
               <PopoverUi
                 childrenTriger={
                   <>
                     <Label className="underline">
-                    처리시설용량에 따른 공사비（백만원)  <i className="diveicon di-search" />
+                      처리시설용량에 따른 공사비（백만원){" "}
+                      <i className="diveicon di-search" />
                     </Label>
                   </>
                 }
@@ -394,7 +420,8 @@ export default function ConCostForm({
               childrenTriger={
                 <>
                   <Label className="underline">
-                  처리시설 총사업비(백만원)  <i className="diveicon di-search" />
+                    처리시설 총사업비(백만원){" "}
+                    <i className="diveicon di-search" />
                   </Label>
                 </>
               }

From fb8812303baa27bf0f38fb3b60da43a8ab716e25 Mon Sep 17 00:00:00 2001
From: leedj312 <dlehd467@gmail.com>
Date: Sun, 6 Jul 2025 23:01:04 +0900
Subject: [PATCH 44/44] =?UTF-8?q?=EA=B2=80=ED=86=A0=EC=99=84=EB=A3=8C=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/store/matDmd/coMatRvw/index.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/wr/app/store/matDmd/coMatRvw/index.tsx b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
index e683b548e..21239fce3 100644
--- a/apps/wr/app/store/matDmd/coMatRvw/index.tsx
+++ b/apps/wr/app/store/matDmd/coMatRvw/index.tsx
@@ -111,7 +111,14 @@ export const coRvwActionsExport: (set: any) => coRvwActions = (set: any) => {
           data
         );
         if (response.status === 200) {
+
+        if(data.flg ==='Sub'){
+
           toast.success("매칭 검토로 저장되었습니다.");
+        }else{
+          toast.success("매칭 검토완료로 저장되었습니다.");
+        }
+
           const coMatRvwRes = await coMatInit(
             1,
             10,