From 590adb5b4ebc18d42153b9a7f19500ed4d797673 Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Fri, 25 Jul 2025 11:42:51 +0900
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=98=A4=EC=88=98=ED=8E=8C=ED=94=84?=
 =?UTF-8?q?=EC=9E=A5,=20=EC=9A=B0=EC=88=98=ED=8E=8C=ED=94=84=EC=9E=A5=20?=
 =?UTF-8?q?=EB=AA=85=EC=B9=AD=20=EB=B0=94=EB=80=90=20=EA=B2=83=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

---
 .../map/components/popupComponent/sewagePump.tsx          | 8 ++++----
 apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
index 18cac4c00..2a945edbc 100644
--- a/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
+++ b/apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx
@@ -2,14 +2,14 @@ import { VerticalTable } from '@/components/ui/verticalTable';
 import React, { useState, useEffect } from 'react'
 // 빗물펌프 자체 입력 정보
 const exclnInputColumn = [
-  { id: "swtrmtZoneCd", title: "배수구역", type: "input" },
-  { id: "mltvDtdvNm", title: "배수분구", type: "input" },
+  { id: "swtrmtZoneCd", title: "처리구역", type: "input" },
+  { id: "mltvDtdvNm", title: "처리분구", type: "input" },
   { id: "dsgnFrqnc", title: "설계빈도(년)", type: "input" },
 ]
 // 오수펌프 자체 입력 정보
 const drtwInputColumn = [
-  { id: "swtrmt_zone_cd", title: "배수구역", type: "input" },
-  { id: "mltv_dtdv_nm", title: "배수분구", type: "input" },
+  { id: "swtrmt_zone_cd", title: "처리구역", type: "input" },
+  { id: "mltv_dtdv_nm", title: "처리분구", type: "input" },
 ]
 
 // 하수펌프장
diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
index 198194918..5c1ebc797 100644
--- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
@@ -95,13 +95,13 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
       else if (lyrTyNm === 'tb_ms_swage_pmstn') { // 하수펌프장
         const drtwPumpCode = DRTW_SEWAGE_PUMP_USE_CODES.find(code => code.text === '오수펌프장');
         if (drtwPumpCode && featureData.values_.usg_cd.trim() === drtwPumpCode.val) {
-          setIsDrtwSewagePump(false);
-          setHeadlist(ExclnSewagePumpCol);
-        }
-        else {
           setIsDrtwSewagePump(true);
           setHeadlist(DrtwSewagePumpCol);
         }
+        else {
+          setIsDrtwSewagePump(false);
+          setHeadlist(ExclnSewagePumpCol);
+        }
         setLayerSpecificNm(featureData.values_.fclt_mng_no);
         result = '하수펌프장';
       }

From b98032155715655915ad1a71122fa0d9f181fb1a Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Fri, 25 Jul 2025 14:24:24 +0900
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20-=20=EC=9A=B4=EC=98=81=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EA=B2=80=EC=83=89=20=ED=95=9C=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=204=EA=B0=9C=EC=94=A9=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(=ED=99=94=EB=A9=B4=20=EB=B9=84=EC=9C=A8?=
 =?UTF-8?q?=20=EA=B3=A0=EB=A0=A4)=20-=20=EC=83=81=EC=84=B8=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20X=20=EB=B2=84=ED=8A=BC=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EA=B3=A0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../map/featureClickEventPopup.tsx            | 87 ++++++++++---------
 .../map/searchModal/searchModal.tsx           | 12 +--
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
index 5c1ebc797..5259fdab6 100644
--- a/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
+++ b/apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx
@@ -473,55 +473,58 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
   return (
     <div id="popup" className="absolute top-0 right-0 w-[350px] h-[calc(100vh-10rem)] bg-white border-r border-gray-300 flex flex-col overflow-hidden transition-all duration-300 z-[50]">
       <LoadingOverlay isLoading={isLoading} />
-      <div className="card-header bg-primary flex items-center justify-between p-4">
-        <div className="flex items-center">
-          <h3 className="text-2xl font-medium text-white text-label whitespace-nowrap mr-4">{layerNm}
+      <div className="card-header bg-primary flex items-center justify-between relative p-4">
+        <div className="flex items-center space-x-4 flex-1">
+          <h3 className="text-2xl font-medium text-white text-label whitespace-nowrap">{layerNm}
             {tableData?.usg_cd && (
               <>
                 ({tableData.usg_cd})
               </>
             )} 정보 <br />관리번호 : {layerSpecificNm}
           </h3>
+          <div className="flex items-center space-x-3">
+            {/* 🎯 하수관로일 때만 Infil/RDII 버튼 표시 */}
+            {layerNm === '하수관로' && (
+              <>
+                <Button onClick={() => setIsModalInfil(true)}
+                  className="py-1 text-xl text-blue-600 border border-blue-600 rounded hover:bg-gray-700"
+                  color="white"
+                  size="sm"
+                >
+                  침입수분석
+                </Button>
+                <Button onClick={() => setIsModalRdii(true)}
+                  className="py-1 text-xl text-gray-600 border border-gray-600 rounded hover:bg-gray-700"
+                  color="white"
+                  size="sm"
+                >
+                  RDII분석
+                </Button>
+              </>
+            )}
+            {layerNm === '하수맨홀' && (
+              <>
+                <Button onClick={() => {
+                  setIsLoading(true);
+                  searchUpperPpls(layerSpecificNm).finally(() => setIsLoading(false));
+                }}
+                  className="px-2 py-1 text-xl text-gray-600 border border-gray-600 rounded hover:bg-gray-700"
+                  color="white"
+                >
+                  상류관로 보기
+                </Button>
+              </>
+            )}
+          </div>
         </div>
-
-        <div className="flex items-center space-x-3">
-          {/* 🎯 하수관로일 때만 Infil/RDII 버튼 표시 */}
-          {layerNm === '하수관로' && (
-            <>
-              <Button onClick={() => setIsModalInfil(true)}
-                className="px-2 py-1 text-xl text-blue-600 border border-blue-600 rounded hover:bg-gray-700"
-                color="white"
-              >
-                침입수분석
-              </Button>
-              <Button onClick={() => setIsModalRdii(true)}
-                className="px-2 py-1 text-xl text-gray-600 border border-gray-600 rounded hover:bg-gray-700"
-                color="white"
-              >
-                RDII분석
-              </Button>
-            </>
-          )}
-          {layerNm === '하수맨홀' && (
-            <>
-              <Button onClick={() => {
-                setIsLoading(true);
-                searchUpperPpls(layerSpecificNm).finally(() => setIsLoading(false));
-              }}
-                className="px-2 py-1 text-xl text-gray-600 border border-gray-600 rounded hover:bg-gray-700"
-                color="white"
-              >
-                상류관로 보기
-              </Button>
-            </>
-          )}
-          <Button
-            onClick={onClose}
-            className="text-white hover:text-gray-300 focus:outline-none"
-          >
-            ✕
-          </Button>
-        </div>
+        <Button
+          onClick={onClose}
+          // className="text-white hover:text-gray-300 focus:outline-none"
+          className="absolute top-8 right-4 text-white hover:text-gray-300 focus:outline-none"
+          size="xs"
+        >
+          ✕
+        </Button>
       </div>
       <div className="overflow-y-auto overflow-x-hidden flex-1" ref={contentRef}>
         <VerticalTable
diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
index 521d9d3c4..b7661d9a4 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
@@ -208,7 +208,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
       } else if (activeTab === 'operation') {
         const RequestDTO: Record<string, string> = {
           page: `${curPage - 1}`,
-          size: '5',
+          size: '4',
         };
         if (var1) RequestDTO.bizNm = var1;
         if (var2 != '0' && var2) RequestDTO.bizTyCd = var2;
@@ -487,8 +487,8 @@ const SearchModal: React.FC<SearchModalProps> = ({
       try {
         const RequestDTO: Record<string, string> = {
           page: `${detailCurPage - 1}`,
-          size: '5',
-          bizId: tableData[index % 5].bizId,
+          size: '4',
+          bizId: tableData[index % 4].bizId,
         };
 
         const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`);
@@ -523,7 +523,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
       try {
         const RequestDTO: Record<string, string> = {
           page: `${detailCurPage - 1}`,
-          size: '5',
+          size: '4',
           bizId: String(detailBizId),
         };
         const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`);
@@ -689,7 +689,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 }
                 tableData={tableData}
                 headlist={dynamicHeadlist}
-                pageSize={5}
+                pageSize={4}
                 total={tableCount}
                 cellClick={handleOperationCellClick}
                 onPageChange={setCurPage}
@@ -711,7 +711,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 }
                 tableData={detailTableData}
                 headlist={dynamicHeadlist2}
-                pageSize={5}
+                pageSize={4}
                 total={detailTableCount}
                 cellClick={undefined}
                 onPageChange={setDetailCurPage}

From 89ca295b6925c9427151815bba3ea329bd08db8e Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Fri, 25 Jul 2025 15:08:39 +0900
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20-=20=EC=B9=A8=EC=9E=85=EC=88=98,=20R?=
 =?UTF-8?q?DII=20=EB=B6=84=EC=84=9D=EA=B2=B0=EA=B3=BC=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98=EB=A6=AC,?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=ED=9B=84=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/(with-base-layout)/ii/BaseLayout.tsx  |  6 +-
 .../(with-base-layout)/ii/rdiiResult/page.tsx | 70 +++++++---------
 .../app/(with-base-layout)/ii/result/page.tsx | 84 ++++++++-----------
 3 files changed, 64 insertions(+), 96 deletions(-)

diff --git a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx
index d2d7d2672..51ac4d291 100644
--- a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx
+++ b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx
@@ -218,7 +218,7 @@ const BaseLayout = ({
         <div className="flex items-center w-full">
           {showDatePicker && ( // showDatePicker 값에 따라 DatePicker 렌더링
             <>
-              <Label className="ml-4 w-20 text-xl text-gray-600 whitespace-nowrap">상수사용기간</Label>
+              <Label className="mr-4 w-20 text-xl text-gray-600 whitespace-nowrap">상수사용기간</Label>
               <DateMonthPicker
                 field={{
                   value: aplcnYmFrom || (() => { // aplcnYm이 없으면 현재 연월을 기본값으로 설정
@@ -247,7 +247,7 @@ const BaseLayout = ({
                     setAplcnYmTo?.(value); // string 값을 직접 전달
                   }
                 }}
-                selectClass="ml-5 w-[100px]"
+                selectClass="w-[100px]"
                 startYear={1900}  // 시작 연도 설정
               />
             </>
@@ -258,7 +258,7 @@ const BaseLayout = ({
             setRtnEnvPartSidoValue={(val) => setCtpvCd?.(val)}
             setRtnEnvPartSigunValue={setSigungu} // 선택된 시군구 값을 받을 콜백 함수 전달
           >
-            <SelectBox label={"하수처리장"} value={selectedSwageTreatmentPlant} selectArray={treatmentFacilityOptions} className="col-span-3" selectClass="rounded-lg bg-white truncate" onSelectValue={(val) => onSwageTreatmentPlantChange?.(val)} selectContentClass="z-[101]" />
+            <SelectBox label={"하수처리장"} value={selectedSwageTreatmentPlant} selectArray={treatmentFacilityOptions} className="col-span-3" selectClass="ml-5 rounded-lg bg-white truncate" onSelectValue={(val) => onSwageTreatmentPlantChange?.(val)} selectContentClass="z-[101]" />
             {/* <SelectBox label={"하수처리구역"} value={selectedSwageProcessingZone} selectArray={processingZoneOptions} className="col-span-3" selectClass="rounded-lg bg-white truncate" onSelectValue={(val) => onSwageProcessingZoneChange?.(val)} selectContentClass="z-[101]" /> */}
           </GovSidoSigunguSearchForm>
           {selectBox?.searchChk ? <SearchFormRight><Button size="sm" onClick={() => selectBox.onSearchClick?.()}>조회</Button></SearchFormRight> : null}
diff --git a/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx b/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx
index 25fc6c374..fa06087bb 100644
--- a/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx
+++ b/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx
@@ -1,5 +1,5 @@
 'use client'
-import { deleteData, getData } from '@/components/lib/api'
+import { deleteData, getData, useCookieAuth } from '@/components/lib/api'
 import { UiTable, downloadExcelWithKoreanHeaders } from '@common/business_components/ui'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useState, useEffect } from 'react'
@@ -53,6 +53,8 @@ const tableColumn = [
 ]
 
 const Result = () => {
+  const AUTH = useCookieAuth();
+
   const form = useForm<ResultFormValues>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -81,24 +83,27 @@ const Result = () => {
   const [totalData, setTotalData] = useState(0) //총 데이터 수
   const [isLoadingResult, setIsLoadingResult] = useState<boolean>(false); // 로딩 상태
   const [selectedRowData, setSelectedRowData] = useState<any>(null);
-  const [selectedRowIndex, setSelectedRowIndex] = useState<number | undefined>(undefined);
   const [resetSelection, setResetSelection] = useState<boolean>(false);
+  const [curPage, setCurPage] = useState(1); // 현재 페이지
 
   useEffect(() => {
     // setCurPage(1);
     handleSearchButtonClick();
   }, [])
 
+  useEffect(() => {
+    // setCurPage(1);
+    handleSearchButtonClick();
+  }, [curPage])
 
-  const handleSearchButtonClick = async (customFormValues?: Partial<ResultFormValues>) => {
+
+  const handleSearchButtonClick = async () => {
     setIsLoadingResult(true);
     setResetSelection(true);
 
-    const formValues = customFormValues || form.getValues(); // react-hook-form에서 현재 값 가져오기
+    const formValues = form.getValues(); // react-hook-form에서 현재 값 가져오기
     console.log("formValues", formValues);
 
-    let inftwtAnlsSearchDto;
-
     // swageTmplntCd 처리 로직 추가
     const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0'
       ? (() => {
@@ -108,30 +113,21 @@ const Result = () => {
       })()
       : null;
 
-    if (customFormValues) {
-      inftwtAnlsSearchDto = {
-        "aplcnYmFrom": formValues.aplcnYmFrom,
-        "aplcnYmTo": formValues.aplcnYmTo,
-        "enoCd": formValues.enoCd,
-        "ctpvCd": formValues.ctpvCd,
-        "sggCd": formValues.sggCd,
-        "swageTmplntCd": processedSwageTmplntCd,
-      };
-    } else {
-      inftwtAnlsSearchDto = {
-        "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null,
-        "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null,
-        "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
-        "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
-        "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
-        "swageTmplntCd": processedSwageTmplntCd,
-      };
-    }
+    let inftwtAnlsSearchDto = {
+      "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null,
+      "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null,
+      "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
+      "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
+      "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
+      "swageTmplntCd": processedSwageTmplntCd,
+      "auth": AUTH,
+    };
+
     console.log("Search DTO:", inftwtAnlsSearchDto);
 
     const queryParams = new URLSearchParams({
-      page: '0',
-      size: '10000000',
+      page: `${curPage - 1}`,
+      size: '10',
       sort: 'rainInfwtAnlsSn,desc'
     });
     Object.entries(inftwtAnlsSearchDto).forEach(([key, value]) => {
@@ -153,14 +149,13 @@ const Result = () => {
         // 추가 처리 및 일련번호 추가
         return {
           ...formattedItem,
-          rowNumber: index + 1, // 1부터 시작하는 일련번호 추가
+          rowNumber: (curPage - 1) * 10 + index + 1, // 1부터 시작하는 일련번호 추가
           scsYn: item.scsYn === null || item.scsYn === undefined ? 'N' : item.scsYn // scsYn이 null이면 'N'으로 변경
         };
       });
 
       // 선택된 행 초기화
       setSelectedRowData(null);
-      setSelectedRowIndex(undefined);
 
       setTableData(dataWithRowNumber);
       setTotalData(dataWithRowNumber.length);
@@ -173,6 +168,7 @@ const Result = () => {
       alert("분석결과 조회 중 오류가 발생했습니다.");
       setTableData([]);
       setTotalData(0);
+      setSelectedRowData(null);
     }
     setResetSelection(false);
   };
@@ -181,7 +177,6 @@ const Result = () => {
   const handleCellClick = (index: number | undefined, headId: string) => {
     if (index !== undefined && tableData[index]) {
       setSelectedRowData(tableData[index]);
-      setSelectedRowIndex(index);
       console.log("Selected row data:", tableData[index]);
     }
   };
@@ -258,16 +253,8 @@ const Result = () => {
       // 테이블 선택 상태 초기화 트리거
       setResetSelection(true);
 
-      // 삭제 후 테이블 새로고침을 위해 재검색
-      const customFormValues: Partial<ResultFormValues> = {
-        aplcnYmFrom: selectedRowData.aplcnYmFrom || null,
-        aplcnYmTo: selectedRowData.aplcnYmTo || null,
-        enoCd: selectedRowData.enoCd || null,
-        ctpvCd: selectedRowData.ctpvCd || null,
-        sggCd: selectedRowData.sggCd || null,
-        swageTmplntCd: selectedRowData.swageTmplntCd || null,
-      };
-      await handleSearchButtonClick(customFormValues);
+      // 검색 버튼 클릭 이벤트 트리거
+      await handleSearchButtonClick();
 
       setIsLoadingResult(false);
 
@@ -320,9 +307,8 @@ const Result = () => {
             tableData={tableData}
             total={totalData}
             pageSize={10}
-            children={undefined}
             cellClick={handleCellClick}
-            onPageChange={(e) => { }}
+            onPageChange={setCurPage}
             resetSelection={resetSelection}
           />
         </div>
diff --git a/apps/sn/app/(with-base-layout)/ii/result/page.tsx b/apps/sn/app/(with-base-layout)/ii/result/page.tsx
index b285cc5e1..d6084e95e 100644
--- a/apps/sn/app/(with-base-layout)/ii/result/page.tsx
+++ b/apps/sn/app/(with-base-layout)/ii/result/page.tsx
@@ -74,26 +74,32 @@ const Result = () => {
     }
   })
 
+  const AUTH = useCookieAuth();
 
   const [tableData, setTableData] = useState<any[]>([]); // API 조회 결과 저장 상태
-  const [totalData, setTotalData] = useState(0) //총 데이터 수
+  const [totalData, setTotalData] = useState(0) //총 데이터 수l
   const [isLoadingResult, setIsLoadingResult] = useState<boolean>(false); // 로딩 상태
   const [selectedRowData, setSelectedRowData] = useState<any>(null);
-  const [selectedRowIndex, setSelectedRowIndex] = useState<number | undefined>(undefined);
   const [resetSelection, setResetSelection] = useState<boolean>(false);
+  const [curPage, setCurPage] = useState(1); // 현재 페이지
 
   useEffect(() => {
     // setCurPage(1);
     handleSearchButtonClick();
   }, [])
-  const auth = useCookieAuth();
-  const handleSearchButtonClick = async (customFormValues?: Partial<ResultFormValues>) => {
+
+  // 페이지 변경 시마다 데이터 fetch
+  useEffect(() => {
+    handleSearchButtonClick();
+  }, [curPage]);
+
+  const handleSearchButtonClick = async () => {
     setIsLoadingResult(true);
     setResetSelection(true);
-    const formValues = customFormValues || form.getValues(); // react-hook-form에서 현재 값 가져오기
+    const formValues = form.getValues(); // react-hook-form에서 현재 값 가져오기
     console.log("formValues", formValues);
 
-    let inftwtAnlsSearchDto;
+
 
     // swageTmplntCd 처리 로직 추가
     const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0'
@@ -104,34 +110,22 @@ const Result = () => {
       })()
       : null;
 
-    if (customFormValues) {
-      inftwtAnlsSearchDto = {
-        "aplcnYmFrom": formValues.aplcnYmFrom,
-        "aplcnYmTo": formValues.aplcnYmTo,
-        "enoCd": formValues.enoCd,
-        "ctpvCd": formValues.ctpvCd,
-        "sggCd": formValues.sggCd,
-        "swageTmplntCd": processedSwageTmplntCd,
-        // "swtrmtZoneCd": formValues.swtrmtZoneCd,
-        "auth" : auth,
-      };
-    } else {
-      inftwtAnlsSearchDto = {
-        "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null,
-        "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null,
-        "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
-        "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
-        "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
-        "swageTmplntCd": processedSwageTmplntCd,
-        // "swtrmtZoneCd": formValues.swtrmtZoneCd === '0' ? null : formValues.swtrmtZoneCd,
-        "auth" : auth,
-      };
-    }
+    let inftwtAnlsSearchDto = {
+      "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null,
+      "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null,
+      "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
+      "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
+      "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
+      "swageTmplntCd": processedSwageTmplntCd,
+      // "swtrmtZoneCd": formValues.swtrmtZoneCd === '0' ? null : formValues.swtrmtZoneCd,
+      "auth": AUTH,
+    };
+
     console.log("Search DTO:", inftwtAnlsSearchDto);
 
     const queryParams = new URLSearchParams({
-      page: '0',
-      size: '10000000',
+      page: `${curPage - 1}`,
+      size: '10',
       sort: 'inftwtAnlsSn,desc'
     });
     Object.entries(inftwtAnlsSearchDto).forEach(([key, value]) => {
@@ -144,6 +138,7 @@ const Result = () => {
     console.log("API: ", `v1/inftwtAnls${queryString ? `?${queryString}` : ''}`);
     try {
       const data = await getData(`v1/inftwtAnls${queryString ? `?${queryString}` : ''}`);
+      console.log("API response:", data);
 
       // 🎯 각 아이템을 개별적으로 포맷팅하면서 일련번호 추가
       const dataWithRowNumber = (data.content || []).map((item: any, index: number) => {
@@ -153,17 +148,16 @@ const Result = () => {
         // 추가 처리 및 일련번호 추가
         return {
           ...formattedItem,
-          rowNumber: index + 1, // 1부터 시작하는 일련번호 추가
+          rowNumber: (curPage - 1) * 10 + index + 1, // 1부터 시작하는 일련번호 추가
           scsYn: item.scsYn === null || item.scsYn === undefined ? 'N' : item.scsYn // scsYn이 null이면 'N'으로 변경
         };
       });
-      
+
       // 선택된 행 초기화
       setSelectedRowData(null);
-      setSelectedRowIndex(undefined);
 
       setTableData(dataWithRowNumber);
-      setTotalData(dataWithRowNumber.length);
+      setTotalData(data?.totalElements || 0); // totalElements가 없을 경우 0으로 설정
       console.log("response:", data);
       console.log("response data:", dataWithRowNumber);
       setIsLoadingResult(false);
@@ -174,7 +168,6 @@ const Result = () => {
       setTableData([]);
       setTotalData(0);
       setSelectedRowData(null);
-      setSelectedRowIndex(undefined);
     }
     setResetSelection(false);
   };
@@ -183,7 +176,6 @@ const Result = () => {
   const handleCellClick = (index: number | undefined, headId: string) => {
     if (index !== undefined && tableData[index]) {
       setSelectedRowData(tableData[index]);
-      setSelectedRowIndex(index);
       console.log("Selected row data:", tableData[index]);
     }
   };
@@ -261,18 +253,9 @@ const Result = () => {
 
       // 테이블 선택 상태 초기화 트리거
       setResetSelection(true);
-
-      // 삭제 후 테이블 새로고침을 위해 재검색
-      const customFormValues: Partial<ResultFormValues> = {
-        aplcnYmFrom: selectedRowData.aplcnYmFrom || null,
-        aplcnYmTo: selectedRowData.aplcnYmTo || null,
-        enoCd: selectedRowData.enoCd || null,
-        ctpvCd: selectedRowData.ctpvCd || null,
-        sggCd: selectedRowData.sggCd || null,
-        swageTmplntCd: selectedRowData.swageTmplntCd || null,
-        // swtrmtZoneCd: selectedRowData.swtrmtZoneCd || null,
-      };
-      await handleSearchButtonClick(customFormValues);
+      
+      // 검색 버튼 클릭 이벤트 트리거
+      await handleSearchButtonClick();
 
       setIsLoadingResult(false);
 
@@ -325,9 +308,8 @@ const Result = () => {
             tableData={tableData}
             total={totalData}
             pageSize={10}
-            children={undefined}
             cellClick={handleCellClick}
-            onPageChange={(e) => { }}
+            onPageChange={setCurPage}
             resetSelection={resetSelection}
           />
         </div>

From 61ed66d4f0955a1ef8947186cb31b2c5af707cfe Mon Sep 17 00:00:00 2001
From: swcho <swcho@mind-one.co.kr>
Date: Fri, 25 Jul 2025 18:00:05 +0900
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20SearchModal=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=ED=8F=AC=EB=A7=A4=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../map/components/common/table.ts            | 23 +++++--
 .../map/searchModal/searchModal.tsx           | 67 ++++++++++++++-----
 2 files changed, 66 insertions(+), 24 deletions(-)

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 68448af71..3148b7ea2 100644
--- a/apps/sn/app/(map-layout)/map/components/common/table.ts
+++ b/apps/sn/app/(map-layout)/map/components/common/table.ts
@@ -28,10 +28,11 @@ export const MsSwagePplCol = [
   // { id: 'lyrTypeNm', title: '레이어타입명' },
 ]
 export const MsSwagePplCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: 'fcltMngNo', title: '시설 관리번호' },
   { id: 'instMngNo', title: '기관 관리번호' },
   { id: 'instlYmd', title: '설치일자' },
-  { id: 'mapshtNo', title: '도엽번호' },
+  // { id: 'mapshtNo', title: '도엽번호' },
   { id: 'pdmt', title: '관경(mm)' },
   { id: 'prlg', title: '연장(m)' },
   { id: 'avgGrdn', title: '평균구배(m/m)' },
@@ -296,10 +297,11 @@ export const SwtrmtFcltCol = [
   // { id: 'obsrvnSptCd', title: '관측지점코드' },
 ];
 export const SwtrmtFcltCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: 'swtrmtFcltNm', title: '하수처리시설명' },
   { id: 'fcltCpct', title: '시설용량(㎥/d)' },
   { id: 'rgnExpln', title: '지역설명' },
-  { id: 'cmcnYmd', title: '준공일자' },
+  // { id: 'cmcnYmd', title: '준공일자' },
   { id: 'oprtngStrtYmd', title: '가동개시일자' },
   // { id: 'clsgYmd', title: '폐쇄일자' },
   // { id: 'prcsMsrcCd', title: '처리공법코드' },
@@ -319,7 +321,7 @@ export const SwtrmtFcltCol2 = [
   // { id: 'pllnArea', title: '부지면적(m²)' },
   // { id: 'mngRprtvBzentyNm', title: '관리대행업체명' },
   { id: 'swtrmtPpltnCnt', title: '하수처리인구수(인)' },
-  { id: 'prcsZoneAreaSum', title: '처리구역면적합계(m²)' },
+  // { id: 'prcsZoneAreaSum', title: '처리구역면적합계(m²)' },
   // { id: 'xcrd', title: 'X좌표' },
   // { id: 'ycrd', title: 'Y좌표' },
   // { id: 'oprtngSttsCd', title: '가동상태코드' },
@@ -346,6 +348,7 @@ export const SwtrmtPrcsZoneCol = [
   { id: 'swtrmt_fclt_nm', title: '하수처리시설명' },
 ];
 export const SwtrmtPrcsZoneCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   // { id: 'swtrmtZoneSn', title: '하수처리구역 일련번호' },
   { id: 'swtrmtZoneNm', title: '하수처리구역명' },
   // { id: 'swtrmt_fclt_cd', title: '하수처리시설코드' },
@@ -380,12 +383,13 @@ export const MsSwageMhlCol = [
   // { id: 'inst_mng_no', title: '기관관리번호' }
 ];
 export const MsSwageMhlCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   // { id: 'fid', title: 'FID' },
   // { id: 'geom', title: 'geometry' },
   // { id: 'ftreSmbolCd', title: '지형지물부호코드' },
   { id: 'fcltMngNo', title: '시설관리번호' },
   // { id: 'pbadmsEmdCd', title: '행정읍면동코드' },
-  { id: 'mapshtNo', title: '도엽번호' },
+  // { id: 'mapshtNo', title: '도엽번호' },
   // { id: 'mngInstCd', title: '관리기관코드' },
   { id: 'instlYmd', title: '설치일자' },
   // { id: 'lastDrdgnYmd', title: '최종준설일자' },
@@ -487,12 +491,13 @@ export const ExclnSewagePumpCol = [
   // { id: 'instMngNo', title: '기관관리번호' },
 ]
 export const ExclnSewagePumpCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   // { id: 'fid', title: 'FID' },
   // { id: 'geom', title: 'geometry' },
   // { id: 'ftreSmbolCd', title: '지형지물부호코드' },
   { id: 'fcltMngNo', title: '시설관리번호' },
   // { id: 'pbadmsEmdCd', title: '행정읍면동코드' },
-  { id: 'mapshtNo', title: '도엽번호' },
+  // { id: 'mapshtNo', title: '도엽번호' },
   // { id: 'mngInstCd', title: '관리기관코드' },
   { id: 'instlYmd', title: '설치일자' },
   { id: 'swagePmstnNm', title: '하수펌프장명' },
@@ -528,6 +533,7 @@ export const DrtwSewagePumpCol = [
   // { id: 'instMngNo', title: '기관관리번호' },
 ]
 export const DrtwSewagePumpCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   // { id: 'fid', title: 'FID' },
   // { id: 'geom', title: 'geometry' },
   // { id: 'ftreSmbolCd', title: '지형지물부호코드' },
@@ -574,6 +580,7 @@ export const stofcbrCol = [
   { id: 'drtn_angl', title: '방향각도(°)' },
 ]
 export const stofcbrCol2 = [
+  { id: 'rowNumber', title: '일련번호' },
   // { id: 'ftreSmbolCd', title: '지형지물부호코드' },
   { id: 'fcltMngNo', title: '시설관리번호' },
   // { id: 'pbadmsEmdCd', title: '행정읍면동코드' },
@@ -650,7 +657,8 @@ export const dateFields = [
   // 🎯 camelCase 버전 추가
   'instlYmd', 'lastDrdgnYmd', 'cmcnYmd', 'oprtngStrtYmd', 'clsgYmd',
   'mesureBeginDt', 'mesureEndDt', 'qltwtrBeginDt', 'qltwtrEndDt',
-  'rainBeginDt', 'rainEndDt'
+  'rainBeginDt', 'rainEndDt', 
+  'flfmtBgngYmd', 'flfmtEndYmd', 'flfmtYr'
 ];
 
 // 🎯 연월 필드들 (yyyymm -> yyyy년 m월)
@@ -677,5 +685,6 @@ export const numberFields = [
   'worflwWallHgt',
   'swrPplEqpAr', 'swrTrtPopl', 'weirHg', 'weirLt',
   'precdngDry', 'rainFall', 'cntncTime', 'rainIn',
-  'mesureIntrvl', 'qltwtrCo', 'rnysnFvlc', 'clarFvlc'
+  'mesureIntrvl', 'qltwtrCo', 'rnysnFvlc', 'clarFvlc',
+  'bizAmt', 'count'
 ];
\ No newline at end of file
diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
index b7661d9a4..cd8b76af7 100644
--- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
+++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx
@@ -5,13 +5,14 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { ExclnSewagePumpCol2, MsSwageMhlCol2, MsSwagePplCol2, stofcbrCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2 } from '../components/common/table';
 //import {  useDcTree, flattenFolders, useSggCd, useCityCd } from './components/searchModalReportApi';
 import { type SelectDataType } from '../commonStore';
-import { MS_SWAGE_PPL_CODES, MS_SWAGE_PPL_USE_CODES } from '../components/common/table';
+import { MS_SWAGE_PPL_CODES, MS_SWAGE_PPL_USE_CODES, MS_SWAGE_MHL_CODES } from '../components/common/table';
 import { addFileName, flattenFolders, getFileDownload, useCityCd, useDcTree, useSggCd } from '../components/searchModalReportApi';
 // import { useBizByFcltStore } from "../../../store/StoreProvider";
 import { getData } from "@/components/lib/api";
 import BasicTab, { BASIC_TYPES } from './basicTab';
 import OperationTab, { BIZ_TY_CD, operationCleaningTableHeadlist, operationInspectionTableHeadlist, operationMaintenanceTableHeadlist, operationTableHeadlist, WORK_TYPES } from './operationTab';
 import ReportTab, { reportTableHeadlist } from './reportTab';
+import { formatDisplayData } from '@/components/lib/utils/formatDisplayValue';
 
 const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}`;
 
@@ -140,10 +141,18 @@ const SearchModal: React.FC<SearchModalProps> = ({
       end: "",
     });
     setShowTable(false);
-    setTableCount(0);
     setTableData([]);
+    setDetailTableData([]);
+    setTableCount(0);
+    setDetailTableCount(0);
+    setCurPage(1); // 페이지를 1로 초기화
+    setDetailCurPage(1); // 페이지를 1로 초기화
+    setIsResetPage(true); // 페이지를 초기화
+    setIsResetDetailPage(true); // 디테일 페이지를 초기화
+    setIsResetSelection(true); // 선택 초기화
+    setIsResetDetailSelection(true); // 선택 초기화
     // queryParams는 fetchFilteredData 내에서 매번 새로 생성되므로 별도 상태 초기화는 필요 없음
-  }, [activeTab, basicType, open]);
+  }, [activeTab, basicType, workType, open]);
 
   useEffect(() => {
     setActiveTab(TABS[0]?.val ?? "basic");
@@ -177,6 +186,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
     setIsLoading(true); // 로딩 시작
     setIsResetSelection(true); // 선택 초기화
     setIsResetDetailSelection(true); // 선택 초기화
+    
     try {
       let cqlFilters: string[] = [];
       if (activeTab === 'basic') {
@@ -201,7 +211,23 @@ const SearchModal: React.FC<SearchModalProps> = ({
         const res = await axios.get(`${API_URL}/v1/fclts?${queryParams.toString()}`);
         console.log('필터링된 API 결과(개수):', res.data.count);
         console.log('필터링된 API 결과(데이터):', res.data.data);
-        setTableData(res.data.data || []);
+
+        // 🎯 각 아이템을 개별적으로 포맷팅하면서 일련번호 추가
+        const dataWithRowNumber = (res.data.data || []).map((item: any, index: number) => {
+          // 🎯 먼저 각 아이템을 포맷팅
+          const formattedItem = formatDisplayData(item);
+          const matched = MS_SWAGE_MHL_CODES.find(code => code.val === item?.mqltCd?.trim());
+
+          // 추가 처리 및 일련번호 추가
+          return {
+            ...formattedItem,
+            rowNumber: (curPage - 1) * 10 + index + 1, // 1부터 시작하는 일련번호 추가
+            scsYn: item.scsYn === null || item.scsYn === undefined ? 'N' : item.scsYn, // scsYn이 null이면 'N'으로 변경
+            mqltCd: matched ? matched.text : item.mqltCd,
+          };
+        });
+
+        setTableData(dataWithRowNumber);
         setTableCount(res.data.count || []);
         console.log('tableCount 상태 업데이트 후:', res.data.count); // tableCount 로그 추가
 
@@ -239,9 +265,11 @@ const SearchModal: React.FC<SearchModalProps> = ({
         console.log('필터링된 API 결과(데이터):', res.content);
 
         const mappedContent = (res.content || []).map((item: any) => {
+          console.log("item:", item);
+          const formattedItem = formatDisplayData(item);
           const matched = BIZ_TY_CD.find(code => code.lwpoCd === item.bizTyCd);
           return {
-            ...item,
+            ...formattedItem,
             bizTyCd: matched ? matched.lwpoCdNm : item.bizTyCd,
           };
         });
@@ -293,8 +321,8 @@ const SearchModal: React.FC<SearchModalProps> = ({
       setTableData([]);
     } finally {
       setIsLoading(false); // 로딩 종료
-      setIsResetSelection(false);
-      setIsResetDetailSelection(false);
+      // setIsResetSelection(false);
+      // setIsResetDetailSelection(false);
     }
   };
 
@@ -458,13 +486,17 @@ const SearchModal: React.FC<SearchModalProps> = ({
 
   // 조회 버튼 클릭 시 1페이지로 이동 및 데이터 초기화
   const handleSearch = () => {
-    setCurPage(1); // 페이지를 1로 초기화
-    setDetailCurPage(1); // 페이지를 1로 초기화
-    setIsResetPage(true); // 페이지를 1로 초기화
-    setIsResetDetailPage(true); // 페이지를 1로 초기화
-    setIsResetSelection(true); // 선택 초기화
-    setIsResetDetailSelection(true); // 선택 초기화
+    // setCurPage(1); // 페이지를 1로 초기화
+    // setDetailCurPage(1); // 페이지를 1로 초기화
+    // setIsResetPage(true); // 페이지를 초기화
+    // setIsResetDetailPage(true); // 디테일 페이지를 초기화
+    // setIsResetSelection(true); // 선택 초기화
+    // setIsResetDetailSelection(true); // 선택 초기화
     fetchFilteredData();
+    setIsResetPage(false); // 페이지를 초기화
+    setIsResetDetailPage(false); // 디테일 페이지를 초기화
+    setIsResetSelection(false); // 선택 초기화
+    setIsResetDetailSelection(false); // 선택 초기화
     setShowTable(true);
   };
 
@@ -479,6 +511,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
   const handleOperationCellClick = async (index?: number | undefined, headId?: String) => {
     setIsResetDetailPage(true); // 페이지를 1로 초기화
     setIsResetDetailSelection(true); // 선택 초기화
+    setIsResetDetailPage(true); // 디테일 페이지를 초기화
 
     if (typeof index === "number") {
       setIsDetailLoading(true);
@@ -659,7 +692,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
             <UiTable
               headName={(() => {
                 const label = BASIC_TYPES.find((type) => type.val === basicType)?.text
-                return (<>{label} 조회 결과 ({tableCount})건</>);
+                return (<>{label} 조회 결과 ({tableCount.toLocaleString('ko-KR')})건</>);
               })()
               }
               tableData={tableData}
@@ -668,7 +701,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
               total={tableCount}
               cellClick={activeTab === 'report' ? handleReportCellClick : handleBasicCellClick}
               onPageChange={setCurPage}
-              resetPageNo={isResetPage}
+              resetPageNo={true}
               resetSelection={isResetSelection}
             />
           </div>
@@ -684,7 +717,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 headName={
                   (() => {
                     const label = WORK_TYPES.find((type) => type.val === workType)?.text
-                    return (<>{label} 사업 현황 ({tableCount})건</>);
+                    return (<>{label} 사업 현황 ({tableCount.toLocaleString('ko-KR')})건</>);
                   })()
                 }
                 tableData={tableData}
@@ -706,7 +739,7 @@ const SearchModal: React.FC<SearchModalProps> = ({
                 headName={
                   (() => {
                     const label = WORK_TYPES.find((type) => type.val === workType)?.text
-                    return (<>{label} 결과표 ({detailTableCount})건</>);
+                    return (<>{label} 결과표 ({detailTableCount.toLocaleString('ko-KR')})건</>);
                   })()
                 }
                 tableData={detailTableData}