Merge commit 'aec7e7de3a006936c703d0d6e40c5d0c42aab84b' into iipbs/wr/dev

apps/wr/app/(with-layout)/stats/rswtStat/page.tsx

@@ -132,7 +132,7 @@ export default function RswtStat() {
       }
       return item;
     });
-
+    
     // 시도별 합계 계산
     transformedRswtDetailList.forEach((item: RswtStatProps[]) => {
       const sidoText = item[0]?.toString();
@@ -144,18 +144,21 @@ export default function RswtStat() {
             sidoData[i] = '합계';
           } else if (i == 3) {
             // 해당 시도의 데이터 개수를 계산
-            const sidoDataCount = rswtDetailList.filter((data: unknown[]) =>
-              Array.isArray(data) && data.length > 0 && String(data[0]) === sidoText
-            ).length;
-            sidoData[i] = sidoDataCount;
+            if (typeof sidoData[i] === "number") {
+              sidoData[i] = (sidoData[i] as number) + 1;
+            } else if ((sidoData[i] === undefined || isNaN(Number(sidoData[i])))) {
+              sidoData[i] = 1;
+            }
           } else if (i == 4) {
             sidoData[i] = '';
           } else if (i == 6) {
             // 법정 대상 건축물 개수 (인덱스 6이 'Y'인 경우)
-            const bumCnt = rswtDetailList.filter((data: unknown[]) =>
-              Array.isArray(data) && data.length > 6 && String(data[0]) === sidoText
-            ).filter((data: unknown[]) => String(data[6]) === '대상').length;
-            sidoData[i] = bumCnt;
+            
+            if (item[i]?.toString() == '대상'&&typeof sidoData[i] === "number") {
+              sidoData[i] = (sidoData[i] as number) + 1;
+            } else if (item[i]?.toString() == '대상'&&(sidoData[i] === undefined || isNaN(Number(sidoData[i])))) {
+              sidoData[i] = 1;
+            }
           } else if (i == 9) {
             const value = Number(item[9]) || 0;
             sidoData[i] = (Number(sidoData[i]) + value) as string | number;
@@ -256,14 +259,14 @@ export default function RswtStat() {
                 <Button
                   className=""
                   size="sm"
-                  onClick={() => excelClick()}
+                  onClick={excelClick}
                 >
                   다운로드
                 </Button>
                 <Button
                   className=""
                   size="sm"
-                  onClick={() => { excelDetailDownLoad() }}
+                  onClick={excelDetailDownLoad}
                 >
                   전체통계다운로드
                 </Button>

apps/wr/components/lib/func/commom.tsx

@@ -180,8 +180,8 @@ const currentYear = new Date().getFullYear();
 export const yearOptions: { val: string; text: string }[] = Array.from(
   { length: currentYear - 1969 },
   (_, i) => ({
-    val: String(1970 + i),
-    text: `${1970 + i}년`,
+    val: String(currentYear - i),
+    text: `${currentYear - i}년`,
   })
 );