feat: 침입수분석, RDII 분석 하수처리장 조회 조건 적용

apps/sn/app/(with-base-layout)/ii/rdii/page.tsx

@@ -341,6 +341,35 @@ export default function RTKForm() {
     console.log('Page changed:', page)
   }
 
+  // 선택된 값을 처리하는 공통 함수
+  const handleSelectValueChange = (
+    val: string | number,
+    setter: (value: string | number) => void
+  ) => {
+    // val이 0이 아닐 경우 .을 기준으로 슬라이싱해서 두번째 값을 설정
+    if (val && val !== '0' && val !== 0) {
+      const valString = String(val);
+      const parts = valString.split('.');
+      if (parts.length > 1 && parts[1] !== undefined) {
+        setter(parts[1]); // 두 번째 값 (인덱스 1)
+      } else {
+        setter(val); // .이 없으면 원래 값 사용
+      }
+    } else {
+      setter('0'); // val이 0이면 '0' 설정
+    }
+  };
+
+  // 하수처리장 변경 핸들러
+  const handleSwageTreatmentPlantChange = (val: string | number) => {
+    handleSelectValueChange(val, setSelect4);
+  };
+
+  // 하수처리구역 변경 핸들러
+  const handleSwageProcessingZoneChange = (val: string | number) => {
+    handleSelectValueChange(val, setSelect5);
+  };
+
   return (
     // <BaseLayout searchBox={{ title: '분석 대상지역 선택' }} titleName={{ mainTitle: 'RDII 분석', firstCardTitle: 'RDII 분석자료 입력', secondCardTitle: '실측자료 등록' }} form={form} onSubmitEvent={() => { }} graphBtn={false} >
     <BaseLayout
@@ -357,9 +386,9 @@ export default function RTKForm() {
       sigungu={select3}
       setSigungu={setSelect3}
       selectedSwageTreatmentPlant={select4}
-      onSwageTreatmentPlantChange={setSelect4}
+      onSwageTreatmentPlantChange={handleSwageTreatmentPlantChange}
       selectedSwageProcessingZone={select5}
-      onSwageProcessingZoneChange={setSelect5}
+      onSwageProcessingZoneChange={handleSwageProcessingZoneChange}
       isLoading={isLoadingResult}
       onAnalysis={handleAnalysisClick}
     >

apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx

@@ -91,6 +91,15 @@ const Result = () => {
 
     let inftwtAnlsSearchDto;
 
+    // swageTmplntCd 처리 로직 추가
+    const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0' 
+      ? (() => {
+          const valString = String(formValues.swageTmplntCd);
+          const parts = valString.split('.');
+          return parts.length > 1 ? parts[1] : valString;
+        })()
+      : null;
+
     if (customFormValues) {
       inftwtAnlsSearchDto = {
         "aplcnYmFrom": formValues.aplcnYmFrom,
@@ -98,7 +107,7 @@ const Result = () => {
         "enoCd": formValues.enoCd,
         "ctpvCd": formValues.ctpvCd,
         "sggCd": formValues.sggCd,
-        "swtrmtZoneCd": formValues.swtrmtZoneCd,
+        "swageTmplntCd": processedSwageTmplntCd,
       };
     } else {
       inftwtAnlsSearchDto = {
@@ -107,7 +116,7 @@ const Result = () => {
         "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
         "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
         "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
-        "swtrmtZoneCd": formValues.swtrmtZoneCd === '0' ? null : formValues.swtrmtZoneCd,
+        "swageTmplntCd": processedSwageTmplntCd,
       };
     }
     console.log("Search DTO:", inftwtAnlsSearchDto);
@@ -237,7 +246,7 @@ const Result = () => {
         enoCd: selectedRowData.enoCd || null,
         ctpvCd: selectedRowData.ctpvCd || null,
         sggCd: selectedRowData.sggCd || null,
-        swtrmtZoneCd: selectedRowData.swtrmtZoneCd || null,
+        swageTmplntCd: selectedRowData.swageTmplntCd || null,
       };
       await handleSearchButtonClick(customFormValues);
 

apps/sn/app/(with-base-layout)/ii/result/page.tsx

@@ -89,6 +89,15 @@ const Result = () => {
 
     let inftwtAnlsSearchDto;
 
+    // swageTmplntCd 처리 로직 추가
+    const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0' 
+      ? (() => {
+          const valString = String(formValues.swageTmplntCd);
+          const parts = valString.split('.');
+          return parts.length > 1 ? parts[1] : valString;
+        })()
+      : null;
+
     if (customFormValues) {
       inftwtAnlsSearchDto = {
         "aplcnYmFrom": formValues.aplcnYmFrom,
@@ -96,7 +105,8 @@ const Result = () => {
         "enoCd": formValues.enoCd,
         "ctpvCd": formValues.ctpvCd,
         "sggCd": formValues.sggCd,
-        "swtrmtZoneCd": formValues.swtrmtZoneCd,
+        "swageTmplntCd": processedSwageTmplntCd,
+        // "swtrmtZoneCd": formValues.swtrmtZoneCd,
       };
     } else {
       inftwtAnlsSearchDto = {
@@ -105,7 +115,8 @@ const Result = () => {
         "enoCd": formValues.enoCd === '0' ? null : formValues.enoCd,
         "ctpvCd": formValues.ctpvCd === '0' ? null : formValues.ctpvCd,
         "sggCd": formValues.sggCd?.val === '0' ? null : formValues.sggCd?.val,
-        "swtrmtZoneCd": formValues.swtrmtZoneCd === '0' ? null : formValues.swtrmtZoneCd,
+        "swageTmplntCd": processedSwageTmplntCd,
+        // "swtrmtZoneCd": formValues.swtrmtZoneCd === '0' ? null : formValues.swtrmtZoneCd,
       };
     }
     console.log("Search DTO:", inftwtAnlsSearchDto);
@@ -237,7 +248,8 @@ const Result = () => {
         enoCd: selectedRowData.enoCd || null,
         ctpvCd: selectedRowData.ctpvCd || null,
         sggCd: selectedRowData.sggCd || null,
-        swtrmtZoneCd: selectedRowData.swtrmtZoneCd || null,
+        swageTmplntCd: selectedRowData.swageTmplntCd  || null,
+        // swtrmtZoneCd: selectedRowData.swtrmtZoneCd || null,
       };
       await handleSearchButtonClick(customFormValues);