diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index 321cece96..8f36db0cb 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -167,8 +167,8 @@ const SearchModal: React.FC = ({ const [var4, setVar4] = useState(""); // 시작, 종료, 경과년도 const [yearFilter, setYearFilter] = useState({ - 시작: "", - 종료: "", + start: "", + end: "", // 경과년도: "", }); @@ -251,8 +251,8 @@ const SearchModal: React.FC = ({ setCtpvCd('0'); setSigungu('0'); setYearFilter({ - 시작: "", - 종료: "", + start: "", + end: "", }); setShowTable(false); setTableCount(0); @@ -323,13 +323,13 @@ const SearchModal: React.FC = ({ if (var2 != '0' && var2) RequestDTO.bizTyCd = var2; // 수행기간 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -418,13 +418,13 @@ const SearchModal: React.FC = ({ const sigunguOption = filteredSiguns.find((n) => n.val === sigungu); filterReportData = filterReportData.filter(item => item.sigungu === sigunguOption?.text); } - if (yearFilter.시작 != "" && yearFilter.종료 == "") //승인년도검색 - filterReportData = filterReportData.filter(item => (item.approvalYear) ? item.approvalYear >= yearFilter.시작 + "년" : null); - if (yearFilter.시작 == "" && yearFilter.종료 != "") - filterReportData = filterReportData.filter(item => (item.approvalYear) ? item.approvalYear <= yearFilter.종료 + "년" : null); - if (yearFilter.시작 != "" && yearFilter.종료 != "") { + if (yearFilter.start != "" && yearFilter.end == "") //승인년도검색 + filterReportData = filterReportData.filter(item => (item.approvalYear) ? item.approvalYear >= yearFilter.start + "년" : null); + if (yearFilter.start == "" && yearFilter.end != "") + filterReportData = filterReportData.filter(item => (item.approvalYear) ? item.approvalYear <= yearFilter.end + "년" : null); + if (yearFilter.start != "" && yearFilter.end != "") { filterReportData = filterReportData.filter(item => { - return (item.approvalYear) ? item.approvalYear >= yearFilter.시작 + "년" && item.approvalYear <= yearFilter.종료 + "년" : null; + return (item.approvalYear) ? item.approvalYear >= yearFilter.start + "년" && item.approvalYear <= yearFilter.end + "년" : null; }); } if (gubun !== "") { // 구분검색 @@ -460,13 +460,13 @@ const SearchModal: React.FC = ({ if (var3) cqlFilters.push(`pbadms_emd_cd='${var3}'`); // 설치년도 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -490,13 +490,13 @@ const SearchModal: React.FC = ({ const cqlFilters: string[] = []; // 가동개시일자 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -532,13 +532,13 @@ const SearchModal: React.FC = ({ const cqlFilters: string[] = []; // // 설치년도 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -559,13 +559,13 @@ const SearchModal: React.FC = ({ const cqlFilters: string[] = []; // 설치년도 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -591,13 +591,13 @@ const SearchModal: React.FC = ({ const cqlFilters: string[] = []; // 설치년도 범위 const startDate = getDateString( - yearFilter.시작, + yearFilter.start, '', '', "19000101", ); const endDate = getDateString( - yearFilter.종료, + yearFilter.end, '', '', `${todayYear}${todayMonth}${todayDate}`, @@ -716,7 +716,7 @@ const SearchModal: React.FC = ({ } setSigungu("0"); setGubun(""); - setYearFilter({ 시작: "", 종료: "", }); + setYearFilter({ start: "", end: "", }); } const renderBody = () => ( @@ -756,13 +756,13 @@ const SearchModal: React.FC = ({
{/* 설치년도 */} setYearFilter({ ...yearFilter, - 시작: range.start, - 종료: range.end, + start: range.start, + end: range.end, }) } startLabel="설치년도" @@ -851,13 +851,13 @@ const SearchModal: React.FC = ({ {/* 가동개시일자 */}
setYearFilter({ ...yearFilter, - 시작: range.start, - 종료: range.end, + start: range.start, + end: range.end, }) } startLabel="가동개시일자" @@ -970,13 +970,13 @@ const SearchModal: React.FC = ({
{/* 설치년도 */} setYearFilter({ ...yearFilter, - 시작: range.start, - 종료: range.end, + start: range.start, + end: range.end, }) } startLabel="설치년도" @@ -1030,9 +1030,9 @@ const SearchModal: React.FC = ({ {/* 설치년도 */}
setYearFilter({ ...yearFilter, 시작: range.start, 종료: range.end })} + start={yearFilter.start} + end={yearFilter.end} + onChange={range => setYearFilter({ ...yearFilter, start: range.start, end: range.end })} startLabel="설치년도" endLabel="" /> @@ -1097,9 +1097,9 @@ const SearchModal: React.FC = ({ {/* 설치년도 */}
setYearFilter({ ...yearFilter, 시작: range.start, 종료: range.end })} + start={yearFilter.start} + end={yearFilter.end} + onChange={range => setYearFilter({ ...yearFilter, start: range.start, end: range.end })} startLabel="설치년도" endLabel="" /> @@ -1138,9 +1138,9 @@ const SearchModal: React.FC = ({ onChange={(e) => { setVar1(e.target.value); }} /> setYearFilter({ ...yearFilter, 시작: range.start, 종료: range.end })} + start={yearFilter.start} + end={yearFilter.end} + onChange={range => setYearFilter({ ...yearFilter, start: range.start, end: range.end })} startLabel="수행기간" endLabel="" /> @@ -1194,9 +1194,9 @@ const SearchModal: React.FC = ({ onChange={(e) => {setGubun(e.target.value);}} /> setYearFilter({ ...yearFilter, 시작: range.start, 종료: range.end })} + start={yearFilter.start} + end={yearFilter.end} + onChange={range => setYearFilter({ ...yearFilter, start: range.start, end: range.end })} startLabel="승인년도" endLabel="" />