diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 4ff7ccb1..926e5648 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -638,13 +638,45 @@ export default function ControlApprovalsTable(props) { const handleFileDownload = async type => { try { + const params = { + applyNo: props.filterId === '' ? null : props.filterId, + searchStDt: props.startDate, + searchEndDt: props.endDate, + ctprvn: + props.filterArea.ctprvn === '전체' ? null : props.filterArea.ctprvn, + sig: props.filterArea.sig === '전체' ? null : props.filterArea.sig, + reviewedType: + props.checkState.reviewedType === '전체' + ? null + : props.checkState.reviewedType, + reviewedProcType: + props.checkState.reviewedProcType === '전체' + ? null + : props.checkState.reviewedProcType, + limitZoneCd: + props.checkState.limitZoneNm === '전체' + ? null + : props.checkState.limitZoneNm, + adress: + props.filterArea.address === '전체' ? null : props.filterArea.address + }; + + const filteredParams = Object.entries(params) + .filter(([_, value]) => value !== null) // null이 아닌 값만 필터링 + .reduce((acc, [key, value]) => { + acc[key] = value; + return acc; + }, {}); + + const queryString = new URLSearchParams(filteredParams).toString(); + const fileDetails = { pdf: { - url: `${HOST}api/bas/dos/plan/download/han-com?searchStDt=${props.startDate}&searchEndDt=${props.endDate}`, + url: `${HOST}api/bas/dos/plan/download/han-com?${queryString}`, name: '비행승인 관련 검토결과.hwp' }, excel: { - url: `${HOST}api/bas/dos/plan/download/excel?searchStDt=${props.startDate}&searchEndDt=${props.endDate}`, + url: `${HOST}api/bas/dos/plan/download/excel?${queryString}`, name: '비행승인 검토.xlsx' } }; diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 364e6fb6..5202a049 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -790,6 +790,8 @@ export default function ControlApprovalsContainer({ mode }) { startDate={startDate} endDate={endDate} selected={selected} + checkState={checkState} + handlerSearch={handlerSearch} handlerDetail={handlerDetail} /> diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index b8e9a646..30992bef 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -925,6 +925,7 @@ export default function OperationApprovalsContainer({ mode }) { selected={selected} selectedPlanSno={selectedPlanSno} handlerDetail={handlerDetail} + handlerSearch={handlerSearch} /> diff --git a/src/containers/flight/popup/ControlApprovalsPopupContainer.js b/src/containers/flight/popup/ControlApprovalsPopupContainer.js index 59203137..4c0198b7 100644 --- a/src/containers/flight/popup/ControlApprovalsPopupContainer.js +++ b/src/containers/flight/popup/ControlApprovalsPopupContainer.js @@ -177,6 +177,7 @@ function ControlApprovalsPopupContainer() { selected={selected} handlerDetail={handlerDetail} handlerSearch={handlerSearch} + checkState={checkState} />