From 2850b1413ff69abfd7cd7aa8d570cba512f9ce55 Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Thu, 17 Jul 2025 14:23:37 +0900
Subject: [PATCH] =?UTF-8?q?feat,=20fix:=20-=20=ED=95=98=EC=88=98=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=8B=9C=EC=84=A4=20=EA=B2=80=EC=83=89=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=EC=97=90=20=EC=B2=98=EB=A6=AC=EA=B5=AC=EC=97=AD=20?=
 =?UTF-8?q?=EB=A9=B4=EC=A0=81=20=EC=B6=94=EA=B0=80=20-=20=EC=9A=B0?=
 =?UTF-8?q?=EC=88=98=ED=86=A0=EC=8B=A4,=20=ED=95=98=EC=88=98=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EC=8B=9C=EC=84=A4,=20=ED=95=98=EC=88=98=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EA=B5=AC=EC=97=AD=20=EA=B4=80=EB=A6=AC=20=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=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

---
 apps/sn/app/(map-layout)/map/SearchModal.tsx  | 32 +++++++++++++++++++
 .../map/components/common/table.ts            |  2 +-
 .../map/featureClickEventPopup.tsx            |  8 ++---
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/SearchModal.tsx b/apps/sn/app/(map-layout)/map/SearchModal.tsx
index 3b0ae20bc..e893fc036 100644
--- a/apps/sn/app/(map-layout)/map/SearchModal.tsx
+++ b/apps/sn/app/(map-layout)/map/SearchModal.tsx
@@ -383,6 +383,11 @@ const SearchModal: React.FC<SearchModalProps> = ({
       cqlFilters.push(`fclt_cpct BETWEEN ${시작1} AND ${종료1}`);
     else if (시작1) cqlFilters.push(`fclt_cpct >= ${시작1}`);
     else if (종료1) cqlFilters.push(`fclt_cpct <= ${종료1}`);
+    // 처리구역 면적
+    if (시작2 && 종료2)
+      cqlFilters.push(`prcsZoneAreaSum BETWEEN ${시작2} AND ${종료2}`);
+    else if (시작2) cqlFilters.push(`prcsZoneAreaSum >= ${시작2}`);
+    else if (종료2) cqlFilters.push(`prcsZoneAreaSum <= ${종료2}`);
     // 하수처리시설명
     if (변수1) cqlFilters.push(`swtrmt_fclt_nm ILIKE '%${변수1}%'`);
     return cqlFilters;
@@ -721,6 +726,33 @@ const SearchModal: React.FC<SearchModalProps> = ({
                       set종료1(val);
                     }}
                   />
+                </div>
+                <div className="mb-2 flex items-center">
+                  {/* 처리구역 면적 */}
+                  <Label className="mr-2 w-auto text-xl text-gray-600">
+                    처리구역 면적(m²)
+                  </Label>
+                  <Input
+                    className="w-[100px] !text-xl placeholder:text-center"
+                    placeholder="입력"
+                    value={시작2}
+                    onChange={(e) => {
+                      // 숫자만 입력 허용
+                      const val = e.target.value.replace(/[^0-9]/g, "");
+                      set시작2(val);
+                    }}
+                  />
+                  <span className="mx-2 text-xl font-semibold">~</span>
+                  <Input
+                    className="mr-8 w-[100px] !text-xl placeholder:text-center"
+                    placeholder="입력"
+                    value={종료2}
+                    onChange={(e) => {
+                      // 숫자만 입력 허용
+                      const val = e.target.value.replace(/[^0-9]/g, "");
+                      set종료2(val);
+                    }}
+                  />
                   {/* 하수처리시설명 */}
                   <Label className="mr-2 w-auto text-xl text-gray-600">
                     하수처리시설명
diff --git a/apps/sn/app/(map-layout)/map/components/common/table.ts b/apps/sn/app/(map-layout)/map/components/common/table.ts
index 19abe05fd..6834e6b43 100644
--- a/apps/sn/app/(map-layout)/map/components/common/table.ts
+++ b/apps/sn/app/(map-layout)/map/components/common/table.ts
@@ -566,7 +566,7 @@ export const DRTW_SEWAGE_PUMP_USE_CODES = [
 // 우수토실
 export const stofcbrCol = [
   // { id: 'ftre_smbol_cd', title: '지형지물부호코드' },
-  { id: 'pbadms_emd_cd', title: '시설관리번호' },
+  { id: 'fclt_mng_no', title: '시설관리번호' },
   // { id: 'pbadms_emd_cd', title: '행정읍면동코드' },
   { id: 'mapsht_no', title: '도엽번호' },
   // { id: 'mng_inst_cd', title: '관리기관코드' },
diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
index 036b358bf..e40a5bfb6 100644
--- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
@@ -57,7 +57,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
   const getSelectedLayers = () => {
     let result = null;
     const layers = gisMap.getLayers().getArray(); // gisMap에서 모든 레이어 가져오기
-    let featureLayer: { get: (key: string) => any }; // 피처가 속한 레이어를 찾기 위한 변수
+    let featureLayer: { get: (key: string) => any } = { get: (key: string) => null }; // 피처가 속한 레이어를 찾기 위한 변수
     layers.forEach((layer: any) => {
       const source = layer.getSource();
       if (source && source.hasFeature && featureData
@@ -135,7 +135,9 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
         // 🎯 기본 데이터 포맷팅
         const formattedData = formatDisplayData(data);
 
-        setLayerSpecificNm(featureData.values_.fclt_mng_no);
+        if (featureData.values_.fclt_mng_no) setLayerSpecificNm(featureData.values_.fclt_mng_no);
+        else if (featureData.values_.swtrmt_fclt_cd) setLayerSpecificNm(featureData.values_.swtrmt_fclt_cd);
+        else setLayerSpecificNm(featureData.values_.manage_no);
         setFetchData(formattedData);
         setTableData(formattedData);
 
@@ -172,7 +174,6 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
               layerName: selectedLayerName,
               data: { ...formattedData }
             }));
-            setLayerSpecificNm(tableData.mqlt_cd);
             // setFetchData(mappedData);
             // setTableData(mappedData);
             break;
@@ -205,7 +206,6 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
               layerName: selectedLayerName,
               data: { ...processedFormattedData }
             }));
-            setLayerSpecificNm(tableData.mqlt_cd);
 
             // 강우/측정 정보 데이터 호출
             if (tableData?.chmbr_xcnts && tableData?.chmbr_ydnts) {