From 383e5f83822787fb9ee09c7beed72565c9d1c477 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 22 Jul 2025 20:38:42 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=ED=85=8C=EC=9D=B4=EB=B8=94,=20=EC=97=91=EC=85=80?=
 =?UTF-8?q?=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/stats/rainStat/page.tsx        |  76 +++++++-------
 apps/wr/app/stats/rswtStat/page.tsx        |  97 +++++++++---------
 apps/wr/app/store/stats/rswtStat/excel.tsx |   3 +-
 apps/wr/app/store/stats/rswtStat/index.tsx | 114 +++++++++++++++------
 apps/wr/public/sample_rswtStats.xlsx       | Bin 10897 -> 10776 bytes
 5 files changed, 169 insertions(+), 121 deletions(-)

diff --git a/apps/wr/app/stats/rainStat/page.tsx b/apps/wr/app/stats/rainStat/page.tsx
index 528f17cd4..591ea5fdf 100644
--- a/apps/wr/app/stats/rainStat/page.tsx
+++ b/apps/wr/app/stats/rainStat/page.tsx
@@ -31,7 +31,7 @@ export default function RainStat() {
     searchRainStatList(searchYear);
   }, [code.cityCd, code.sggCd, searchRainStatList])
 
-  const excelDetailDownLoad = () => {
+  const excelDetailDownLoad=() =>{
     const sidoList = new Set<string>();
     const sidoDataMap = new Map<string, (string | number)[]>(); // 시도별 데이터를 저장할 Map
     const sidoDetailMap = new Map<string, (string | number)[][]>(); // 시도별 상세 데이터를 저장할 Map
@@ -49,7 +49,7 @@ export default function RainStat() {
 
       sidoText = sido?.text || '';
       sigunText = sigun?.text || '';
-
+      
       // 시도, 시군구 코드를 텍스트로 변환하여 데이터에 할당
       if (item.length > 0) {
         item[0] = sidoText as unknown as RainStatProps;
@@ -58,7 +58,7 @@ export default function RainStat() {
         item[1] = sigunText as unknown as RainStatProps;
       }
       if (item.length > 2) {
-        item[2] = sidoText + ' ' + sigunText as unknown as RainStatProps;
+        item[2] = sidoText+' '+sigunText as unknown as RainStatProps;
       }
 
       // 시도별 상세 데이터 수집
@@ -89,32 +89,32 @@ export default function RainStat() {
         const sidoData = sidoDataMap.get(sidoText)!;
         // 각 컬럼의 값을 합계에 더하기 (1번 인덱스부터 시작)
         for (let i = 1; i < item.length && i < sidoData.length; i++) {
-          if (i == 2) {
+          if(i == 2){
             sidoData[i] = '합계';
-          } else if (i == 3) {
+          } else if(i == 3){
             // 해당 시도의 데이터 개수를 계산
-            const sidoDataCount = rainDetailList.filter((data: unknown[]) =>
+            const sidoDataCount = rainDetailList.filter((data: unknown[]) => 
               Array.isArray(data) && data.length > 0 && String(data[0]) === sidoText
             ).length;
             sidoData[i] = sidoDataCount;
-          } else if (i == 4) {
+          } else if( i == 4){
             sidoData[i] = '';
-          } else if (i == 6) {
+          } else if(i == 6){
             // 법정 대상 건축물 개수 (인덱스 6이 'Y'인 경우)
-            const bumCnt = rainDetailList.filter((data: unknown[]) =>
+            const bumCnt = rainDetailList.filter((data: unknown[]) => 
               Array.isArray(data) && data.length > 6 && String(data[0]) === sidoText
             ).filter((data: unknown[]) => String(data[6]) === '대상').length;
             sidoData[i] = bumCnt;
-          } else if (i == 8) {
+          } else if(i==8){
             const value = Number(item[8]) || 0;
             sidoData[i] = (Number(sidoData[i]) + value) as string | number;
-          } else if (i == 11) {
+          } else if(i==11){
             const value = Number(item[11]) || 0;
             sidoData[i] = (Number(sidoData[i]) + value) as string | number;
-          } else if (i == 12) {
+          } else if(i==12){
             const value = Number(item[12]) || 0;
             sidoData[i] = (Number(sidoData[i]) + value) as string | number;
-          } else if (i == 14) {
+          } else if(i==14){
             const value = Number(item[14]) || 0;
             sidoData[i] = (Number(sidoData[i]) + value) as string | number;
           }
@@ -127,12 +127,12 @@ export default function RainStat() {
 
     // 시도별로 합계와 상세 데이터를 순서대로 배치
     const summaryExcelData: (string | number)[][] = [];
-
+    
     // 시도별로 순회하면서 합계와 상세 데이터를 추가
     Array.from(sidoList).forEach((sidoText) => {
       const sidoSummary = sidoDataMap.get(sidoText);
       const sidoDetails = sidoDetailMap.get(sidoText) || [];
-
+      
       if (sidoSummary) {
         // 시도 합계 데이터 추가
         summaryExcelData.push(sidoSummary);
@@ -147,14 +147,14 @@ export default function RainStat() {
     const sidoTotalSummary = [['전체', '', '합계', 0, '', '', 0, '', '', 0, 0, 0, 0, 0, 0, '', 0]];
     sidoSummaryList.forEach((item: (string | number)[]) => {
       item.forEach((value: string | number, index: number) => {
-        if (typeof value === 'number') {
+        if(typeof value === 'number') {
           if (sidoTotalSummary[0] && index < sidoTotalSummary[0].length) {
             sidoTotalSummary[0][index] = Number(sidoTotalSummary[0][index]) + Number(value);
           }
         }
       });
     });
-
+    
     // sidoSummaryList와 rainDetailList를 합쳐서 엑셀 데이터 생성
     const excelData = [...sidoTotalSummary, ...sidoSummaryList, ...summaryExcelData];
 
@@ -175,30 +175,28 @@ export default function RainStat() {
       headerRange: "A1:M1"
     })
   }
-
+  
   useEffect(() => {
     const transExcel = Array.isArray(excelList) ? excelList : [excelList];
     const excelData = tableData(transExcel, { code });
     const tbData = Array.isArray(excelData)
-      ? excelData
-        .filter((item: RainStatProps) => item.cityText !== '없음')
-        .map((item: RainStatProps) => {
-          return {
-            "시도": item.cityText,
-            "개소": item.tmp,
-            "설치비(백만원)": item.instlCst,
-            "저류조용량(m³/년)": item.dtfcltCpct,
-            "연간사용량(m³/년)": item.wtrUsqty,
-            "조경용수": item.lndwtr,
-            "청소화장실용수": item.cleanToilUswtr,
-            "세척살수용수": item.resn,
-            "농업용수": item.farmUswtr,
-            "공업용수": item.indstUswtr,
-            "친수용수": item.hydUswtr,
-            "기타": item.ithlEtcUswtr,
-            "연간운영비(백만원/년)": item.anlOperCst,
-          };
-        })
+      ? excelData.map((item: RainStatProps) => {
+        return {
+          "시도": item.cityText,
+          "개소": item.tmp,
+          "설치비(백만원)": item.instlCst,
+          "저류조용량(m³/년)": item.dtfcltCpct,
+          "연간사용량(m³/년)": item.wtrUsqty,
+          "조경용수": item.lndwtr,
+          "청소화장실용수": item.cleanToilUswtr,
+          "세척살수용수": item.resn,
+          "농업용수": item.farmUswtr,
+          "공업용수": item.indstUswtr,
+          "친수용수": item.hydUswtr,
+          "기타": item.ithlEtcUswtr,
+          "연간운영비(백만원/년)": item.anlOperCst,
+        };
+      })
       : [];
     setExData(tbData);
   }, [code, excelList])
@@ -239,7 +237,7 @@ export default function RainStat() {
                   />
                 </div>
                 <div className="flex flex-row space-x-2 items-center">
-                  <Button className="" size={"sm"} onClick={() => { searchRainStatList(searchYear); }}>
+                  <Button className="" size={"sm"} onClick={()=>{searchRainStatList(searchYear);}}>
                     조회
                   </Button>
                   <Button className="" size={"sm"} onClick={() => excelClick()}>
@@ -266,7 +264,7 @@ export default function RainStat() {
                   total={0}
                   headName={""}
                   cellClick={undefined}
-                  onPageChange={() => { }}
+                  onPageChange={() => {}}
                 ></UiTable>
               </ScrollArea>
             </ListDiv>
diff --git a/apps/wr/app/stats/rswtStat/page.tsx b/apps/wr/app/stats/rswtStat/page.tsx
index 6968552cb..e693cafec 100644
--- a/apps/wr/app/stats/rswtStat/page.tsx
+++ b/apps/wr/app/stats/rswtStat/page.tsx
@@ -14,70 +14,70 @@ import {
 import ListDiv from "@common/business_components/ui/list_div";
 import { Button } from "@common/components/ui";
 import { useEffect, useState } from "react";
+import toast, { Toaster } from "react-hot-toast";
+import { useTranslation } from "react-i18next";
 
 export default function RswtStat() {
   const { code, rswtStat, searchRswtStatList } = useWrStore((state) => state);
-  const { rswtStatList, excelList, rswtDetailList } = rswtStat;
+  const { rswtStatList, rswtDetailList } = rswtStat;
   const [rswtTable, setRswtTable] = useState<RswtStatProps[]>();
   const [searchYear, setSearchYear] = useState<string>(
     String(new Date().getFullYear())
   );
-  const [excelData, setExceData] = useState<Record<string, string | number>[]>();
 
+  const { t } = useTranslation('base');
   useEffect(() => {
-    searchRswtStatList(searchYear)
-  }, [searchRswtStatList])
+    searchRswtStatList(searchYear, code.cityCd)
+  }, [searchRswtStatList, code.cityCd])
 
   const excelClick = () => {
-    downloadExcel({
-      data: (excelData as unknown as JSON[]) ?? [],
-      fileName: "중수도재이용통계",
-      sheetNameArray: ["Sheet1"],
-      headerRange: "A1:N1"
-    })
+
+    if (rswtTable) {
+      const data = rswtTable.map((item: RswtStatProps) => {
+        return {
+          "시도": item.cityText,
+          "개소": item.ctpvCnt,
+          // "건축연면적(m³)": item.archArea,
+          "처리용량(m³)": item.filtrTrtmfctCpct,
+          "물사용량(m³/년)": item.wtrUsqty,
+          "중수도+대체수이용량(m³/년)": item.rswtAltSum,
+          "중수도이용량(m³/년)": item.rswtrUsqty,
+          "대체수이용량(m³/년)": item.altUswtrUtztnQnt,
+          "조경용수": item.lndwtr,
+          "청소화장실용수": item.cleanToilUswtr,
+          "농업용수": item.farmUswtr,
+          "공업용수": item.indstUswtr,
+          "친수용수": item.hydUswtr,
+          "기타": item.ithlEtcUswtr,
+          "연간운영비(백만원/년)": item.anlOperCst,
+        };
+      })
+
+      downloadExcel({
+        data: (data as unknown as JSON[]) ?? [],
+        fileName: "중수도재이용통계",
+        sheetNameArray: ["Sheet1"],
+        headerRange: "A1:N1"
+      })
+    } else {
+      toast.error(t("excelDownErrMsg"))
+    }
   }
 
   useEffect(() => {
     const transData = Array.isArray(rswtStatList) ? rswtStatList : [rswtStatList];
-    const data = tableData(transData, { code });
-    const tbData = Array.isArray(data)
-      ? data.map((item: RswtStatProps) => {
+    const cityData = tableData(transData, { code });
+    const tbData = Array.isArray(cityData)
+      ? cityData.map((item: RswtStatProps) => {
         return {
           ...item,
-          ctpvCd: item.cityText
+          ctpvCd: item.cityText === '전체' ? '전국' : item.cityText,
+          cityText: item.cityText === '전체' ? '전국' : item.cityText 
         };
-      }).filter((item: RswtStatProps) => item.cityText !== '없음')
-      : [];
-    setRswtTable(tbData);
-  }, [code, rswtStatList])
+      }) : [];
 
-  useEffect(() => {
-    const transExcel = Array.isArray(excelList) ? excelList : [excelList];
-    const exData = tableData(transExcel, { code });
-    const tbData = Array.isArray(exData) ?
-      exData
-        .filter((item: RswtStatProps) => item.cityText !== '없음')
-        .map((item: RswtStatProps) => {
-          return {
-            "시도": item.cityText,
-            "개소": item.ctpvCnt,
-            // "건축연면적(m³)": item.archArea,
-            "처리용량(m³)": item.filtrTrtmfctCpct,
-            "물사용량(m³/년)": item.wtrUsqty,
-            "중수도+대체수이용량(m³/년)": item.rswtAltSum,
-            "중수도이용량(m³/년)": item.rswtrUsqty,
-            "대체수이용량(m³/년)": item.altUswtrUtztnQnt,
-            "조경용수": item.lndwtr,
-            "청소화장실용수": item.cleanToilUswtr,
-            "농업용수": item.farmUswtr,
-            "공업용수": item.indstUswtr,
-            "친수용수": item.hydUswtr,
-            "기타": item.ithlEtcUswtr,
-            "연간운영비(백만원/년)": item.anlOperCst,
-          };
-        }) : [];
-    setExceData(tbData);
-  }, [code, excelList])
+    setRswtTable(tbData);
+  }, [code, rswtStatList]);
 
   const excelDetailDownLoad = () => {
     const sidoList = new Set<string>();
@@ -199,7 +199,7 @@ export default function RswtStat() {
     });
 
     const sidoSummaryList = Array.from(sidoDataMap.values());
-    const sidoTotalSummary = [['전체', '', '합계', 0, '', '', 0, '', '', 0, 0, 0, 0, 0, 0, '', 0]];
+    const sidoTotalSummary = [['전국', '', '합계', 0, '', '', 0, '', '', 0, 0, 0, 0, 0, 0, '']];
     sidoSummaryList.forEach((item: (string | number)[]) => {
       item.forEach((value: string | number, index: number) => {
         if (typeof value === 'number') {
@@ -217,7 +217,7 @@ export default function RswtStat() {
       excelData as unknown as [][],
       "중수도시설 통계",
       "sample_rswtStats.xlsx",
-      "A1:Q3",
+      "A1:P3",
       4
     );
   }
@@ -244,7 +244,7 @@ export default function RswtStat() {
                   className=""
                   size="sm"
                   onClick={() => {
-                    searchRswtStatList(searchYear)
+                    searchRswtStatList(searchYear, code.cityCd)
                   }}
                 >
                   조회
@@ -285,6 +285,7 @@ export default function RswtStat() {
           </ListDiv>
         </div>
       </div>
+      <Toaster position="top-center"></Toaster>
     </ContentsDiv>
   </>
   );
diff --git a/apps/wr/app/store/stats/rswtStat/excel.tsx b/apps/wr/app/store/stats/rswtStat/excel.tsx
index 7c6e2b4cc..00935b8fb 100644
--- a/apps/wr/app/store/stats/rswtStat/excel.tsx
+++ b/apps/wr/app/store/stats/rswtStat/excel.tsx
@@ -1,4 +1,5 @@
 import type { RswtStatProps } from ".";
+import { bdstUsgCd } from "../../common/code/basicCode";
 
 export const excelRswtStat = (excelList:RswtStatProps[]) : (string | number)[][] => {
   const excelData: (string | number)[][] = [];
@@ -14,7 +15,7 @@ export const excelRswtStat = (excelList:RswtStatProps[]) : (string | number)[][]
         String(item.bdstNm) ?? "",
         //건축물용도코드(빈칸)
         //String(item.bdstUsgCd) ?? "",
-        "",
+        bdstUsgCd.find((cd)=> cd.val === item.bdstUsgCd.toString())?.text ?? "",   //건축물용도
         //주소
         String(item.daddr) ?? "",
         //법적의무대상여부
diff --git a/apps/wr/app/store/stats/rswtStat/index.tsx b/apps/wr/app/store/stats/rswtStat/index.tsx
index af106c3b3..ca81cff2a 100644
--- a/apps/wr/app/store/stats/rswtStat/index.tsx
+++ b/apps/wr/app/store/stats/rswtStat/index.tsx
@@ -6,7 +6,7 @@ import { excelRswtStat } from "./excel";
 export type RswtStatProps = {
     cityText: string            //시도명
     ctpvCd: string              //시도
-    sggCd : string              //시군구
+    sggCd: string              //시군구
     areaNm: string              //행정구역명
     bdstNm: string              //시설명
     daddr: string               //주소
@@ -26,9 +26,10 @@ export type RswtStatProps = {
     ithlEtcUswtr: number        //기타
     anlOperCst: number          //연간운영비
     guideStats: GuideStatProps[]
-    utztnUsgCd : string         //이용코드
-    lawTrgtYn : string          //법적의무대상여부
-    instlCmptnDt : string       //설치완료일자
+    utztnUsgCd: string         //이용코드
+    lawTrgtYn: string          //법적의무대상여부
+    instlCmptnDt: string       //설치완료일자
+    bdstUsgCd: number
 }
 
 export type GuideStatProps = {
@@ -37,7 +38,7 @@ export type GuideStatProps = {
 }
 
 type rswtStatActions = {
-    searchRswtStatList: (year: string) => void;
+    searchRswtStatList: (year: string, city: { val: string; text: string }[]) => void;
 }
 
 export type ExcelType = {
@@ -71,36 +72,47 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
     set: any
 ) => {
     return {
-        searchRswtStatList: async (year: string) => {
+        searchRswtStatList: async (year: string, city: { val: string; text: string }[]) => {
             const res = await getFetch(fetchType.WR, `/reuseChk/reuseWater/stat/${year}`)
-
+            console.log("city", city)
+            console.log("res", res)
+            const data = res.filter(item => {
+                const code = item.ctpvCd.trim();
+                return city.some(el => el.val === code);
+            });
+            console.log("data", data)
             const cityArr: any[] = [];
-            res.forEach((item: RswtStatProps) => {
+            data.forEach((item: RswtStatProps) => {
                 let obj = cityArr.find((e) => {
                     return e.ctpvCd == item.ctpvCd
                 })
 
                 if (obj) {
-                    obj.ctpvCnt += 1
-                    obj.archArea += item.archArea
-                    obj.filtrTrtmfctCpct += item.filtrTrtmfctCpct
-                    obj.wtrUsqty += item.wtrUsqty
-                    obj.rswtAltSum += (item.rswtrUsqty + item.altUswtrUtztnQnt)
-                    obj.rswtrUsqty += item.rswtrUsqty
-                    obj.altUswtrUtztnQnt += item.altUswtrUtztnQnt
-                    obj.anlOperCst += item.anlOperCst
+                    obj.ctpvCnt += 1                                                //개소
+                    // obj.archArea += item.archArea 건축면적 삭제
+                    obj.filtrTrtmfctCpct += item.filtrTrtmfctCpct                   //처리용량 
+                    obj.wtrUsqty += item.wtrUsqty                                   //물사용량
+                    obj.rswtAltSum += (item.rswtrUsqty + item.altUswtrUtztnQnt)     //중수도+대체수
+                    obj.rswtrUsqty += item.rswtrUsqty                               //중수도사용량
+                    obj.altUswtrUtztnQnt += item.altUswtrUtztnQnt                   //대체수이용량
+                    obj.anlOperCst += item.anlOperCst                               //연간운영비용
                 } else {
-                    obj = {};
-                    obj.ctpvCd = item.ctpvCd
-                    obj.ctpvCnt = 1
-                    obj.archArea = item.archArea
-                    obj.filtrTrtmfctCpct = item.filtrTrtmfctCpct
-                    obj.wtrUsqty = item.wtrUsqty
-                    obj.rswtAltSum = item.rswtrUsqty + item.altUswtrUtztnQnt
-                    obj.rswtrUsqty = item.rswtrUsqty
-                    obj.altUswtrUtztnQnt = item.altUswtrUtztnQnt
-                    obj.anlOperCst = item.anlOperCst
-
+                    obj = {
+                        ctpvCd: item.ctpvCd,
+                        ctpvCnt: 1,
+                        filtrTrtmfctCpct: item.filtrTrtmfctCpct,
+                        wtrUsqty: item.wtrUsqty,
+                        rswtAltSum: item.rswtrUsqty + item.altUswtrUtztnQnt,
+                        rswtrUsqty: item.rswtrUsqty,
+                        altUswtrUtztnQnt: item.altUswtrUtztnQnt,
+                        anlOperCst: item.anlOperCst,
+                        lndwtr: 0,
+                        cleanToilUswtr: 0,
+                        farmUswtr: 0,
+                        indstUswtr: 0,
+                        hydUswtr: 0,
+                        ithlEtcUswtr: 0,
+                    }
                     cityArr.push(obj)
                 }
 
@@ -120,11 +132,47 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
                 }
             });
 
+            const total: any = {
+                ctpvCd: "0",
+                ctpvCnt: 0,
+                filtrTrtmfctCpct: 0,
+                wtrUsqty: 0,
+                rswtAltSum: 0,
+                rswtrUsqty: 0,
+                altUswtrUtztnQnt: 0,
+                anlOperCst: 0,
+                lndwtr: 0,
+                cleanToilUswtr: 0,
+                farmUswtr: 0,
+                indstUswtr: 0,
+                hydUswtr: 0,
+                ithlEtcUswtr: 0,
+            };
+
+            cityArr.forEach(item => {
+                total.ctpvCnt += item.ctpvCnt;
+                total.archArea += item.archArea;
+                total.filtrTrtmfctCpct += item.filtrTrtmfctCpct;
+                total.wtrUsqty += item.wtrUsqty;
+                total.rswtAltSum += item.rswtAltSum;
+                total.rswtrUsqty += item.rswtrUsqty;
+                total.altUswtrUtztnQnt += item.altUswtrUtztnQnt;
+                total.anlOperCst += item.anlOperCst;
+                total.lndwtr += item.lndwtr;
+                total.cleanToilUswtr += item.cleanToilUswtr;
+                total.farmUswtr += item.farmUswtr;
+                total.indstUswtr += item.indstUswtr;
+                total.hydUswtr += item.hydUswtr;
+                total.ithlEtcUswtr += item.ithlEtcUswtr;
+            });
+
+            cityArr.unshift(total);
+
             cityArr.forEach(item => {
                 excelDownList.push({
                     ctpvCd: item.ctpvCd,
                     ctpvCnt: item.ctpvCnt,
-                    archArea: item.archArea,
+                    // archArea: item.archArea,
                     filtrTrtmfctCpct: item.filtrTrtmfctCpct,
                     wtrUsqty: item.wtrUsqty,
                     rswtAltSum: item.rswtAltSum,
@@ -139,21 +187,21 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
                     anlOperCst: item.anlOperCst,
                 })
             })
+            console.log("엑셀다운리스트", excelDownList)
 
             //상세
-            const rswtDetailList : RswtStatProps[] = [];
-            res.forEach((item:RswtStatProps) => {
+            const rswtDetailList: RswtStatProps[] = [];
+            res.forEach((item: RswtStatProps) => {
                 const utztnUsgArray = new Array<string>();
                 item.guideStats.forEach((guideStat) => {
                     utztnUsgArray.push(guideStat.utztnUsgCd);
                 })
                 rswtDetailList.push({
                     ...item,
-                    rswtAltSum : item.rswtrUsqty + item.altUswtrUtztnQnt,
-                    utztnUsgCd : utztnUsgArray.join(', '),
+                    rswtAltSum: item.rswtrUsqty + item.altUswtrUtztnQnt,
+                    utztnUsgCd: utztnUsgArray.join(', '),
                 })
             });
-            
             const excelDetailData = excelRswtStat(rswtDetailList);
             set((state: rswtStatState) => ({
                 rswtStat: {
diff --git a/apps/wr/public/sample_rswtStats.xlsx b/apps/wr/public/sample_rswtStats.xlsx
index 702c4cec0da4eefb5c10e37547be86a7579c4cc9..bee059e26d1da9056a6d1b1994b21cc9c903346c 100644
GIT binary patch
delta 5199
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
O3}?Q(B$3?z!2Smf7qblj

delta 5293
zcmZ8lbx;)Ezg=qSSVFo(x&)<jNs(R}q`Mo5g{5Pur6m_B=}<sGI+q3oL|GaHq(lTH
zp5OQ8{l4?w{o~G^Ip^Nb%)K+`p3liM%z!lA;Xz}mQh7Eo0Du`R0Du$#00g@W1$p_p
z*?M`o2?l$(zd^i6TM#CTJ5j&IMg8_DXb~V2H|-Zpu+kkKJ?13$E!40(5E>zId5}fK
zv~*pxBs_N<(Pm0RKWqIcMKcwF3EXj?URWu7(lq~R;@J287wS*4abYaCyFgoO`cHQ3
z2q;7b`u>>lm~Zbg1@Lsc8$RcxL2gf|8k7Ii+NH|J8T^JkNaGX_Ng|*iCS^LgS388~
za19<i<sn)U(;R>!iZJLO<G~(fd?Bqr-vB>3=aFFdMqd+tPk9WkXiFLeP2^{+I65&V
zX)e4Y{eBLvydd((0#jR1IK^mIa?KpShE5~IiW)5H=qok?GmG#~<O!Y>A|)5thJxND
z>F$N8R2**1VFuoNREhnl%*{=f)Jc*za?c<*_ybRkGy-=7KF!qX#kqf}p?Vo`I0m@H
zkMJjm3S-XV`FuesN&#6;T5cf;nD%NBEei2RD~{;%yo~iC)>lqD_rY<u%mkJlL7Oiu
zE3)~S69lG<ZgD$f87MW?vul3xJeZf+%HB@26Wn+U?di4*7PY)P^t-oJDfj7alsFtM
zl7@^v-Amp<?QFJPVk|bmw{<^+_0Y^fBbjj{Q)$^-%g;*U%SsjL2OOJno=j45cGN6@
zyl*rK1lq^qgu5kfN(vpDuW$eW1OkhkpxsH-j}a39u);+U5;8z%JQozmMou!$Nj?`R
z>9(-mf|TBeR>us%v1B5ty5JSTj4kG1Pkf1lw;+Ldvd0`qqyYCA-m?w}+m1(v!{d{_
z4nYXcC|rjr^zOBnWAE9)>&EVa%Xt^?B`08~0Y7NUh6)|HlB!rNA8HY-E+)wDXf9qN
z33QPvbT7CroQ8JJo|=yk>r)}`6ZEZWq>6`=Bfi;OIj(vI=kzr-D~I%Km^^KiN<DRL
zv*492E#47DLT)X&h<qQI<^uEo*e<P1FlC{J7CYSz2D;5-&WK>cuJSpp4L~*7YreS}
z;eZ0c4hygskn1RIThY7ojg`u$fqEGa=T$ih9rtMKSSZqTR6nnGr?qx|92&C|(k+u_
z$WogY%KeCS_JOrG=yR<8TQ|x+naRDU>%kaaUG0V@zF(rtpQb3&auyuDUw=V=lhN(W
zDo0pzD~USJB3JZ=A#KRUwggkCuPrDVVS7~W<{A&(LghFq6g1kiB6$u}z}kLrY^Tig
zb!5EBSLjJts^C^eirOh1<E);)LZvX3Okru~L)2hystj><)~G;;utL8J@|SqX9lVHR
zU#e~S<ad>8LqXiRTUOxDpH^|@ChcFqU_ya!N3XS3@E7fi!y<!NkFS3CXIA0^uPq$S
zD2oH58U$hkr+Qoyc(2XQzl@)@3#>?R-%<QI6Qw1w&Qn;<@hhw&rY#xwvb^%Io;6F_
zE5F7?WMEOY@)PF*p}HZ^kCgZT0PHycK>R<d;pZRX?%?;2W^7xSr>%}qMUc)uD3I-!
zPj+z#a^U0y;$y2P0|KKy`f_Tb@~ETUFnGW)UFfKtzhDwums2mtns=z%Zrgy`6|K(W
z`H!Jv`5O+7ZS$^mJ4s>${Z>9hlDE5IdrzNmgq{dO!*zo9!Oir*aJ^3UWEe%tU?TnG
z&1U1Vd3^)-P$Hw2yAV;~$Kd0k&93N@o`qzD-%MxFu0$e$4b~x4%sGCmp1FCJzqNW+
z<b8~NiV{l+la3m6<{JJv*8EuHU^_IE7v(YD{!L+$gW=kaiS;9+tjVPL)@;dYV(7su
zPv2CiLn2IG?v>Z0n2hiPjKvD%s+~<u8~eKsOwSL#AT*<z4TCm9n#GWy${^^-V%Sx)
z(mpMbgRHBBV>sPjoc^lx8F4hnqmd0Zb%nc9ccQa>MY0G=ll^DTRILlZo-4bJvLA}c
zY?{$)5*GvN>I$pECSS>yKO%~nZw^owD^&x~L*p6aw31Rp)%%lIdn;+Y$Kj4@BI&vK
zhA$T5YEYb4g52cdns~NYApgdF1!aNkgT8z3XcFy=N&>DFtkUH%>}bri!shscfM)t(
zNUaQ6(u)Ytl=dH_gJO!FeW&l>dSEI;oMa}329|Xj9O$gvDpu>q;vpQNWa_L<1Vchi
z<5?YXDGxpOIxw~w$VZ;Sw>9b`dQ~vCbqhQEtvX$67zx7<-Yt$$(zkokb{r&@9r?&M
z*3F0!XWPz-?koPtm(a8Bk4lI3LgnI>_#;In`CgxfNKY55Ty`Qi*_0-<zs<3d$Ogf5
zCsjLcQG?6X;kIz?(*Pd(>fkNKW)*0)16-<|<-*=M^{twes1H6LL?Y}HOlMgAgl^y9
z`ZVh8gnxl_rxn$hesOw-a}GQDdtT)V<jXhDrA2X-rRGc>zvRH^#8!W<@Mg>Wf(ABW
zKvYe@)O!L2`<`T>09|Z4z&?%YlCBmc9xAbpmV><wa7_qk)nu(sgb*mcsDo~reMp+k
z4b|)lG~&S)Z~h1Pq&*DkFp#dLgcX=nkSz}JTD8BOHMW^*+U@?&J|m;BUC?q}(SIMJ
zkLNkbTa4Eqb}W{{)wHVD(18-po%jNjoyq4C#!dUWLVNQ%#_#GuOpAP(ispi=L6#6}
zRr&d*3TY~|xG5Bqo-<rT(r=V>-FA}K!^qAlx1*jfYfe!O(!Msglj>Rh!`;?kt|HuN
zQ}DL7oUgGbLtdAC{>O2YffUh1^7fOLE&Ob(_r5n0q1JCj777{rxCjvIM|#6F<7}KK
zG&M|Nc5kG-Q!@_qGN@h*;JAOSr*Jp5G#zOzfA&5XI)&M|v^y<l{HwDS1%w|T8N_}g
zf?V`NII6sKWv`Cn4*Fc48K&JGIhJpUBtPo<HB}hFm?E>Nyh|fp97H;N{!#~Zfx$-|
zz2?h{O^7~6{I;IMyquYfa5<wgLZ3I9z8xb0%C7o3MV(+bJsf}&rB%B=*h%=e2rTXR
zcbP0hCsmVQ(GL+^h8-6@_->R)WyH3B6Jh$A^oVzSj?78XH>^EUxj-&qV2Jkd)q6k|
zhgYP@D$E3Q4MGblg%c{xinnWfQM1;GxZ5-OuX@L<gNWZf&)cAu!a=&=_K=*}gyZhk
z;;5E>$fvQngji#%xpJxIJ*TAU&&E>)guw%#YYjSl+@{-Q4DK0`m@&ViVAb6q!}@|R
zITs2Z#Q0Ex?43Rr{Csa+=KNK1bH8X&hX^v`1iFoNsmiilDMQI}choSk5pVVZfOC#F
zX1MZ-H2XUM@}w2dp^!WH88ZjKlUqH>v!eM^u2Q+X`<;rpgB_tT9fv`bC9^oGxyKV|
z*b`1uJ3Y~Ns^z+wQsm#3)^1H!zSb$Lu)gbbiC10u+O0fw{rYtvcly+nlo)#Ig|yhj
z?k;1}>24(>fxTZV$yAWv0tx)wBkzZ^*Py#vD4(OW*$)>rWP3{sT)<VQwr43Pr>W4W
zsa-`Np@H6lRo=X@^pWG-R>rgC!VlM+(3yd;JDSfW)w12s(4VBqh&IZ{iqSzi`!)vM
zLSf&uw;n{e{1K%3#DP@aB(8sQzugL0YABEvU#dXvJ7>wQUdm`Z1Z3PFlaghK4nlOZ
zUUo2jeH(v^J-l$n7T5JM&eU#tl*DIW(ecQMmzR*oM;H2ol_X|+Q&+BPNOAM4GL#{5
zY-mG4Yp7rFT5hw{3^iQ#0ZxufHP5tPYAl#qF|htd2|d7HoT2vtYa(Q}K9PMAsb4^j
zYll{5uzB=JAxnbh57Q=ID|d*VVPC){nOdI8uplSNq&KM#XRDMZ9k{SxLnV~HwYs>}
zf7E5f?Ju>C)~(R7n=4fqRUkqKl}<bUJOpxFNkICkW{La6m_9}B7lIsKFxce$Q`}aW
z!SN1bEwr!Voj#cj;um(X*y$8Dh{=?BRwBF<45qQKf4SFouTQp-N~|d5gvX1Mp^oA;
z--BER$s?(a!~Q7e%a|&h-Vn-J_TI?c9U&<P3eqQBlxk=0bM7w>m7sWTpLib|*LpEE
zTIGn&-m_8}&8m{8Z8cck{XYNwz!zDUFH#j+QPOMD6UJd7cjI?6oQx7mfSJ;ZNx&t;
zFKWE6e?R{Ige?KiR;{%`Yksqoyo9!_yFWJsWN_Nl#n%*qc<x5GF2>U;(#1z4JS6Y-
z%0K;lpj28`PbQaJDuouyTlU;mVh?0aCu5<=CPXtKi39mc^IDp;T_%~cmADVVF{0k}
zlAMkBjwTb;?{<j_S=sJ>GcPzndHqpljT5!mCnfp}TXz<jM;jqpf)y4K*J9y%1^o0;
zXUYfmEyRd~@yxH%NzfOwwMnOz6+3O1_F9ECJ*Sy}cGAK#!k`a0AD5UqCTDK?!fCin
zz%Mz_Xf;xi$nZWe&@uF6)Z0$xmg-T)Dz&^MZQ$e<#dD8<9h>$Fx70aN_=XQ^R&8+0
z4wVH7xuDk-eAT!B>Q3JWdT9-u1i@aLQr&T1uJ>r_$t^S7%FchLu8Ag+D=x!yr|YVD
zzta`R*3SRJNY?Dt>hb#z9#hVyaY&~2UmJ-ww3LB%GeKhGnMleLXEWXrz0I4{Js^%T
zj<P>rI(GaLkrHoS`WUJeD39@vjUwn^mcqgKYrr$f5x9&jP*cCR>XZ>BZ?8!yPmHnK
z)oa?tMuv|56y-k~GO7VgDZF-wxGPkSo`~XFlZm;MelCPwiuVM{%VWI^b@JIf^R9jk
zuWV?Z-FYr#LHaBAuO*<cd>%s~$XF8ZUJY#qKS<vEOzX!@LuV4(DMb_6h%P=;0>8K6
zIF7^7o?izMLi<}beb(`=XdB@iN%^f>(U|C_f~f|OgjF?)C@@Tm<fB=L;A`I?`X=2m
z4w0XX7+X3|t+KXPFn{OyM^W^8lrsyGvZ*(phUtV=Xaop&|G1XgZf-rbSu1f|_4)br
zdz$`DpPyavX|}V1lrl-1%-+YjXDkcOO&8X{jw7>4BdBt?`xiuOj%Nz+J7&+TBX&t=
zw*gZbk&;fBK-6Q)!Cx=E@8eSaA`8+*H5i2}wg^s&ibT=O2dzxHS6*N6#mcbkmIiI4
zPdsu&1DV~PzxRFrF?gGqdeYnr+ke%q?Iu><1Y|)IdM)mdNSM;6K<9BZv?FI9^I*1K
z)?%$#qyv@o_2PM|+=G_*UeadXliJX^3O-%W9h%}d8!<IykdYS+J*@6CdW1I<ZrzBM
zy{;S#e1tp0KP^iC`L~ZS+#hy2`R7o);LfUj;oU*i@)X-f{_kZk|I|cm+XcCe&a}zV
z57vo!A!BAgFbD6o{VqsHEa|P464MQp?0Vbk*~g$_LA(kWPX2)k2I#}S$=FD^%!PM;
zYGFhEAtrsV<c$U0t`&U~d*oNUKhxs2$M}Pe@Y|_ECimN2@2I(~$F)tit~~U<sLElR
z13V|OgzI=9gmz4m4cD#PCCIuv+nniA>LztAq<WAb>YTh<<D~q)FF0Ol%aMuV`<zC*
zWE`|m-&!;33Be?{w{{dE!6c8jMid``g~56pW;<m^d7mr}69-EzgZ4uPrVeFrWgj7q
z70)SQBqN4nMr5z6J9KIJzNQ(T5d?|1dt>1OzR6b2g3Twi=+f!2X|hkKxPZTN!@1cj
zK%5m~$nGpv!<_j9UIRKkA5HeRIxb*NUMRd;vjRl*Rt#yDt!mit7d4_gq?BzyTy$tJ
zY)R?q9Drqc5<Y0SS`<}34nP)jgFO@k)~M{c_hVsoQm@CUQO6gTFLp-ilo{9bq)DXg
zjXH6ePUa_GMAcxE)b?uR?A8s$QdXO;RG2f2hpdzvUvzMX7E;RYQeibG3FcBk1?!P0
z$Z=-lcz_BK?cIx5LfU(ezte+dEMdr}wOmVnrBUTr!m=&B4@YQ||GfgzNLbberBSAD
z?YDg@Pg-=5r0}?IykOu2Cs=!eDQ0w`MXhV>!tmA6jDWW}f}X1?LN&^dz(Utr5F^BH
zKp=nz<EpnY#-7FaZ+-hJtAz+pZtv$&(ga@();9p@3=_$3WcYymR#nu~V881}LNG_%
zRH(GcnlCdy{d^w`bi3A4)+<WVZW|mAS<eY~g{&K(fW;H{PB{WXOK;Hm4p?pu4}K`%
z`NUPM16I7l?UxptDby9*VQ@b8%p3&-PFxi^V1XRMJXfGB*`g6HE4opDXP1ZabYS``
zBX${T!81N4g6j|kikG0UF}!OY(pFMA8X8Hrz^x%SAuX|z`p9-itj4kC?sF6~Ozpe4
zbw7^9;=(RaZbz8RokB=~Z(8M^9d$i4^mLx>vF#b+H?u#{5{N1EG?C@b=*c2GQ}Xf|
zSnB56(i^O~2f#nFh>t17RAuxxjtXtPWM#pCreyZ(L<`dlpK#riz6o-+@$|(00G`qo
z6akf=eQrb35LCDv(meFwJhh*T#?QU%xxZO6&ivKP+k@q7uqdixqmYi9xr9s)NwR8z
z_kxR?wFrzplj|?S6y08hXM0oqG#f-TP&u1No-t??<keFCsE3G*#GRDca(R<{AF`~6
z@;QFf-!l=pANTD8u@YKDIlxTgq)QuB*`!!;m@^KZ=gKO06LA`{)c4zvZ8A6FSmw)<
zUQ7&`QoV;XEbts>30$$H9+&f|+AWAFJ~_1OxMhu4m6Q7oxl;;k-Hdc*3!W4gHh25-
z%lJpL)~S6fz4ds?w-2T#1Y|)1cftY){SX+GugG+;Y~Lzz`qgNM|Fd7iafb@Qg03=@
z(tM4rf8yPvox#XXoktNJlViMrFTrbFy3~7J`-7?hNteu<yzK2~GAUjI_-90=;hQLQ
zYy{SS_wb<{D_HpdN&XO)++qy>W<US{<=>9}-*HEPASHZ+h~*(eEO66dXd#Zdx#<6Y
z0Prt;3n9eA!tn3+1_03f3;tcPF(TY}cp3il(0_9$(ElNrvLTvzWHELTCp_%HKac;x
F{tH)b-oyX^


From 99229a8453aada65465e578d71fae56783c73b59 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 22 Jul 2025 20:41:37 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=B0=BD=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/store/stats/rswtStat/index.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/wr/app/store/stats/rswtStat/index.tsx b/apps/wr/app/store/stats/rswtStat/index.tsx
index ca81cff2a..89c4089c0 100644
--- a/apps/wr/app/store/stats/rswtStat/index.tsx
+++ b/apps/wr/app/store/stats/rswtStat/index.tsx
@@ -74,13 +74,10 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
     return {
         searchRswtStatList: async (year: string, city: { val: string; text: string }[]) => {
             const res = await getFetch(fetchType.WR, `/reuseChk/reuseWater/stat/${year}`)
-            console.log("city", city)
-            console.log("res", res)
             const data = res.filter(item => {
                 const code = item.ctpvCd.trim();
                 return city.some(el => el.val === code);
             });
-            console.log("data", data)
             const cityArr: any[] = [];
             data.forEach((item: RswtStatProps) => {
                 let obj = cityArr.find((e) => {
@@ -187,7 +184,6 @@ export const rswtStatActionsExport: (set: any) => rswtStatActions = (
                     anlOperCst: item.anlOperCst,
                 })
             })
-            console.log("엑셀다운리스트", excelDownList)
 
             //상세
             const rswtDetailList: RswtStatProps[] = [];

From 0a109111cbf2cae77a348bddb2116a56950852e8 Mon Sep 17 00:00:00 2001
From: jyha00 <jyha@mind-one.co.kr>
Date: Tue, 22 Jul 2025 20:55:14 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=A4=91=EC=88=98=EB=8F=84=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=83=81=EC=84=B8=20=EC=97=91=EC=85=80=20=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wr/app/stats/rswtStat/page.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/wr/app/stats/rswtStat/page.tsx b/apps/wr/app/stats/rswtStat/page.tsx
index e693cafec..99a8bc4f3 100644
--- a/apps/wr/app/stats/rswtStat/page.tsx
+++ b/apps/wr/app/stats/rswtStat/page.tsx
@@ -72,7 +72,7 @@ export default function RswtStat() {
         return {
           ...item,
           ctpvCd: item.cityText === '전체' ? '전국' : item.cityText,
-          cityText: item.cityText === '전체' ? '전국' : item.cityText 
+          cityText: item.cityText === '전체' ? '전국' : item.cityText
         };
       }) : [];
 
@@ -80,12 +80,15 @@ export default function RswtStat() {
   }, [code, rswtStatList]);
 
   const excelDetailDownLoad = () => {
+
     const sidoList = new Set<string>();
     const sidoDataMap = new Map<string, (string | number)[]>(); // 시도별 데이터를 저장할 Map
     const sidoDetailMap = new Map<string, (string | number)[][]>(); // 시도별 상세 데이터를 저장할 Map
 
     // 먼저 시도별 상세 데이터를 그룹화
-    rswtDetailList.forEach((item: RswtStatProps[]) => {
+    const transformedRswtDetailList = rswtDetailList.map((originItem: RswtStatProps[]) => {
+      // rswtDetailList.forEach((item: RswtStatProps[]) => {
+      const item = [...originItem]; // 원본 복사
       const sidoVal = item.at(0)?.toString().trim();
       const sigunVal = item.at(1)?.toString().trim();
       let sidoText = '';
@@ -127,10 +130,11 @@ export default function RswtStat() {
         }
         sidoDataMap.set(sidoText, initialData);
       }
+      return item;
     });
 
     // 시도별 합계 계산
-    rswtDetailList.forEach((item: RswtStatProps[]) => {
+    transformedRswtDetailList.forEach((item: RswtStatProps[]) => {
       const sidoText = item[0]?.toString();
       if (sidoText && sidoDataMap.has(sidoText)) {
         const sidoData = sidoDataMap.get(sidoText)!;