Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev

apps/sn/app/(map-layout)/map/components/popupComponent/sewagePump.tsx

@@ -2,8 +2,8 @@ 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" },
 ]
 // 오수펌프 자체 입력 정보

apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx

@@ -39,6 +39,7 @@ export const BIZ_TY_CD_SELECT_ARRAY = BIZ_TY_CD.map(item => ({
 }));
 // 운영정보 - 사업 현황
 export const operationTableHeadlist = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: "bizNm", title: "사업명" },
   { id: "flfmtBgngYmd", title: "수행시작일자" },
   { id: "flfmtEndYmd", title: "수행종료일자" },
@@ -48,6 +49,7 @@ export const operationTableHeadlist = [
 ];
 // 운영정보 - 보수 및 갱신 결과표
 export const operationMaintenanceTableHeadlist = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: "fcltMngNo", title: "관리번호" },
   { id: "usgCd", title: "용도" },
   { id: "mqltCd", title: "재질" },
@@ -58,6 +60,7 @@ export const operationMaintenanceTableHeadlist = [
 ];
 // 운영정보 - 청소 및 준설 결과표
 export const operationCleaningTableHeadlist = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: "fcltMngNo", title: "관리번호" },
   { id: "usgCd", title: "용도" },
   { id: "mqltCd", title: "재질" },
@@ -67,6 +70,7 @@ export const operationCleaningTableHeadlist = [
 ];
 // 운영정보 - 점검 및 진단 결과표
 export const operationInspectionTableHeadlist = [
+  { id: 'rowNumber', title: '일련번호' },
   { id: "fcltMngNo", title: "관리번호" },
   { id: "usgCd", title: "용도" },
   { id: "mqltCd", title: "재질" },

apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx

@@ -265,12 +265,13 @@ const SearchModal: React.FC<SearchModalProps> = ({
         console.log('필터링된 API 결과(개수):', res.totalElements);
         console.log('필터링된 API 결과(데이터):', res.content);
 
-        const mappedContent = (res.content || []).map((item: any) => {
+        const mappedContent = (res.content || []).map((item: any, index: number) => {
           console.log("item:", item);
           const formattedItem = formatDisplayData(item);
           const matched = BIZ_TY_CD.find(code => code.lwpoCd === item.bizTyCd);
           return {
             ...formattedItem,
+            rowNumber: (curPage - 1) * 4 + index + 1, // 1부터 시작하는 일련번호 추가
             bizTyCd: matched ? matched.lwpoCdNm : item.bizTyCd,
           };
         });
@@ -529,11 +530,14 @@ const SearchModal: React.FC<SearchModalProps> = ({
         console.log('운영정보 cellClick 데이터:', res);
         console.log('운영정보 length:', res.data.length);
 
-        const mappedData = (res.data || []).map((item: any) => {
+        const mappedData = (res.data || []).map((item: any, detailIndex: number) => {
+          const formattedItem = formatDisplayData(item);
+
           const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim());
           const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim());
           return {
-            ...item,
+            ...formattedItem,
+            rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1,
             usgCd: usgCdObj ? usgCdObj.text : item.usgCd,
             mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd,
           };
@@ -561,14 +565,15 @@ const SearchModal: React.FC<SearchModalProps> = ({
           bizId: String(detailBizId),
         };
         const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`);
-        console.log('운영정보 페이지네이션 데이터:', res);
-        console.log('운영정보 페이지네이션 length:', res.data.length);
 
-        const mappedData = (res.data || []).map((item: any) => {
+        const mappedData = (res.data || []).map((item: any, detailIndex: number) => {
+          const formattedItem = formatDisplayData(item);
+
           const usgCdObj = MS_SWAGE_PPL_USE_CODES.find(code => code.val === item.usgCd.trim());
           const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim());
           return {
-            ...item,
+            ...formattedItem,
+            rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1,
             usgCd: usgCdObj ? usgCdObj.text : item.usgCd,
             mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd,
           };