From 16570bfd4576ceae375430cd30b508e3286a38d0 Mon Sep 17 00:00:00 2001 From: swcho Date: Wed, 6 Aug 2025 18:35:24 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=95=98=EC=88=98=EA=B4=80=EB=A1=9C=20D?= =?UTF-8?q?B=20=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=BB=AC=EB=9F=BC=EB=AA=85?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(map-layout)/map/components/InputSection.tsx | 4 ++-- .../(map-layout)/map/components/common/index.ts | 4 ++-- .../(map-layout)/map/components/common/table.ts | 8 ++++---- .../map/components/popupComponent/MsSwagePpl.tsx | 8 ++++---- .../map/searchModal/operationTab.tsx | 16 ++++++++-------- .../(map-layout)/map/searchModal/searchModal.tsx | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/components/InputSection.tsx b/apps/sn/app/(map-layout)/map/components/InputSection.tsx index e35165bd2..1d45103a1 100644 --- a/apps/sn/app/(map-layout)/map/components/InputSection.tsx +++ b/apps/sn/app/(map-layout)/map/components/InputSection.tsx @@ -3,7 +3,7 @@ import React from "react"; interface InputSectionProps { title: string; - data: { year: string; type: string, bizNm: string, bizType: string }[]; + data: { year: string; type: string, bizInfoNm: string, bizType: string }[]; sectionKey: string; onInputChange: (section: string, index: number, field: string, value: string) => void; } @@ -41,7 +41,7 @@ const InputSection: React.FC = ({ title, data, sectionKey, on /> - {row.bizNm} + {row.bizInfoNm} {row.bizType} diff --git a/apps/sn/app/(map-layout)/map/components/common/index.ts b/apps/sn/app/(map-layout)/map/components/common/index.ts index 45cb3a18d..2581ac0fa 100644 --- a/apps/sn/app/(map-layout)/map/components/common/index.ts +++ b/apps/sn/app/(map-layout)/map/components/common/index.ts @@ -52,8 +52,8 @@ export const handleInputChange = (section: string, value: string, dataMap: { [key: string]: { - data: { year: string; type: string, bizNm: string, bizType: string }[]; - setData: React.Dispatch>; + data: { year: string; type: string, bizInfoNm: string, bizType: string }[]; + setData: React.Dispatch>; }; } ) => { 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 5604d1b55..59b01fd15 100644 --- a/apps/sn/app/(map-layout)/map/components/common/table.ts +++ b/apps/sn/app/(map-layout)/map/components/common/table.ts @@ -4,8 +4,8 @@ export const MsSwagePplCol = [ { id: 'inst_mng_no', title: '기관관리번호' }, { id: 'instl_ymd', title: '설치일자' }, { id: 'mapsht_no', title: '도엽번호' }, - { id: 'pdmt', title: '관경(mm)' }, - { id: 'prlg', title: '연장(m)' }, + { id: 'pdmt_vl', title: '관경(mm)' }, + { id: 'prlg_vl', title: '연장(m)' }, { id: 'usg_cd', title: '용도' }, { id: 'mqlt_cd', title: '재질' }, { id: 'avg_grdn', title: '평균구배(m/m)' }, @@ -33,8 +33,8 @@ export const MsSwagePplCol2 = [ { id: 'instMngNo', title: '기관\n관리번호' }, { id: 'instlYmd', title: '설치일자' }, // { id: 'mapshtNo', title: '도엽번호' }, - { id: 'pdmt', title: '관경\n(mm)' }, - { id: 'prlg', title: '연장\n(m)' }, + { id: 'pdmtVl', title: '관경\n(mm)' }, + { id: 'prlgVl', title: '연장\n(m)' }, { id: 'avgGrdn', title: '평균구배\n(m/m)' }, { id: 'tmptDpth', title: '시점깊이\n(m)' }, { id: 'tmptMhlMngNo', title: '시점맨홀\n관리번호' }, diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx index dfee86537..fa1d770e7 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/MsSwagePpl.tsx @@ -17,7 +17,7 @@ const inputColumn = [ { id: "layCd", title: "매설위치", type: "select", options: ["도로", "하상"] }, ]; -type operationDataType = { year: string; type: string, bizNm: string, bizType: string }; +type operationDataType = { year: string; type: string, bizInfoNm: string, bizType: string }; const MsSwagePpl = ({ featureData, onSaveClick }: { featureData: any, onSaveClick?: () => void }) => { const [formData, setFormData] = useState({}); @@ -59,7 +59,7 @@ const MsSwagePpl = ({ featureData, onSaveClick }: { featureData: any, onSaveClic inspectionArr.push({ year: String(item.flfmt_yr), type: seTypeName, - bizNm: String(item.biz_nm), + bizInfoNm: String(item.biz_info_nm), bizType: tyTypeName, }); break; @@ -67,7 +67,7 @@ const MsSwagePpl = ({ featureData, onSaveClick }: { featureData: any, onSaveClic cleaningArr.push({ year: String(item.flfmt_yr), type: seTypeName, - bizNm: String(item.biz_nm), + bizInfoNm: String(item.biz_info_nm), bizType: tyTypeName, }); break; @@ -77,7 +77,7 @@ const MsSwagePpl = ({ featureData, onSaveClick }: { featureData: any, onSaveClic repairArr.push({ year: String(item.flfmt_yr), type: seTypeName, - bizNm: String(item.biz_nm), + bizInfoNm: String(item.biz_info_nm), bizType: tyTypeName, }); break; diff --git a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx index c52a4ddab..155a17215 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/operationTab.tsx @@ -13,11 +13,11 @@ export const WORK_TYPES = [ // 운영정보 - 사업 현황 export const operationTableHeadlist = [ { id: 'rowNumber', title: '일련번호' }, - { id: "bizNm", title: "사업명" }, + { id: "bizInfoNm", title: "사업명" }, { id: "flfmtBgngYmd", title: "수행시작일자" }, { id: "flfmtEndYmd", title: "수행종료일자" }, { id: "flfmtYr", title: "수행년도" }, - { id: "bizTyCd", title: "사업유형" }, + { id: "bizTypeCd", title: "사업유형" }, { id: "bizAmt", title: "사업금액" }, ]; // 운영정보 - 보수 및 갱신 결과표 @@ -26,8 +26,8 @@ export const operationMaintenanceTableHeadlist = [ { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, - { id: "pdmt", title: "관경(mm)" }, - { id: "prlg", title: "연장(m)" }, + { id: "pdmtVl", title: "관경(mm)" }, + { id: "prlgVl", title: "연장(m)" }, { id: "instlYmd", title: "설치일자" }, // { id: "instlYmd", title: "사업구분" }, ]; @@ -37,8 +37,8 @@ export const operationCleaningTableHeadlist = [ { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, - { id: "pdmt", title: "관경(mm)" }, - { id: "prlg", title: "연장(m)" }, + { id: "pdmtVl", title: "관경(mm)" }, + { id: "prlgVl", title: "연장(m)" }, { id: "instlYmd", title: "설치일자" }, ]; // 운영정보 - 점검 및 진단 결과표 @@ -47,8 +47,8 @@ export const operationInspectionTableHeadlist = [ { id: "fcltMngNo", title: "관리번호" }, { id: "usgCd", title: "용도" }, { id: "mqltCd", title: "재질" }, - { id: "pdmt", title: "관경(mm)" }, - { id: "prlg", title: "연장(m)" }, + { id: "pdmtVl", title: "관경(mm)" }, + { id: "prlgVl", title: "연장(m)" }, { id: "instlYmd", title: "설치일자" }, { id: "strct_stat_grd", title: "구조적 상태등급" }, { id: "oper_stat_grd", title: "운영적 상태등급" }, diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index 898b9a963..576fca802 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -224,8 +224,8 @@ const SearchModal: React.FC = ({ page: `${curPage - 1}`, size: '5', }; - if (var1) RequestDTO.bizNm = var1; - if (var2 != '0' && var2) RequestDTO.bizTyCd = var2; + if (var1) RequestDTO.bizInfoNm = var1; + if (var2 != '0' && var2) RequestDTO.bizTypeCd = var2; // 수행기간 범위 const startDate = getDateString( yearFilter.start, @@ -255,11 +255,11 @@ const SearchModal: React.FC = ({ 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); + const matched = BIZ_TY_CD.find(code => code.lwpoCd === item.bizTypeCd); return { ...formattedItem, rowNumber: (curPage - 1) * 5 + index + 1, // 1부터 시작하는 일련번호 추가 - bizTyCd: matched ? matched.lwpoCdNm : item.bizTyCd, + bizTypeCd: matched ? matched.lwpoCdNm : item.bizTypeCd, }; });