Merge commit '0c16b9d14df0f523bbdd6908536b40f9e88e6d56' into iipbs/wr/dev

apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/excel.tsx

@@ -6,6 +6,7 @@ import {
   isInvalidNumber,
   parseRawValue,
 } from "@/components/lib/func/excelFunc";
+import toast from "react-hot-toast";
 export const useTypes = [
   "조경용수",
   "청소화장실용수",
@@ -16,6 +17,18 @@ export const useTypes = [
   "기타",
 ];
 
+
+export const chkMngType =[
+  '위탁',
+  '자체'
+]
+export const chkSpwtPositnType = [
+  '유량계', 
+  '수위계',
+  '펌프적산전력계',
+  '기타'
+]
+
 export type Buildingtype = {
   bdstInfoSn: number;
   ctpvCd: 1;
@@ -143,43 +156,56 @@ export const excelToRainChkData = (excelData: any, year: string) => {
     })
     .filter((el: any) => el !== undefined);
 
+console.log("rainChkgdData", rainChkgdData);
   if (rainChkgdData.length > 0) {
     rainChkgdData.forEach((rain: any) => {
       const defaultMessage = `[시설명: ${rain.bdstNm}, 점검일: ${rain.chckYmd}, 이용용도: ${rain.guideDetails[0]?.utztnUsgCd}] 항목에서  `;
 
       if (rain.chckYmd && isInvalidDate(rain.chckYmd)) {
         issues.push(
-          defaultMessage + `점검일: 날짜 형식 아님 (${rain.chckYmd})`
+          defaultMessage + `점검일: 날짜 형식 아님  입력값 : (${rain.chckYmd})`
         );
       }
       if (rain.anlOperCst.length > 2 && isInvalidNumber(rain.anlOperCst)) {
         issues.push(
           defaultMessage +
-            ` 연간운영비(원/년): 숫자 형식 아님 (${rain.anlOperCst})`
+            ` 연간운영비(원/년): 숫자 형식 아님 /입력값:${rain.anlOperCst}`
         );
       }
+      if (rain.oilqMeasMthd.length > 1 && !chkMngType.includes(rain.oilqMeasMthd)) {
+        issues.push(
+          defaultMessage + `유량측정방법:  위탁 혹은 자체 만 허용) /입력값:${rain.oilqMeasMthd}`
+        );
+      }
+      if (rain.spwtPositn.length > 1 && !chkSpwtPositnType.includes(rain.spwtPositn)) {
+        issues.push(
+          defaultMessage + `측정위치: 유량계, 수위계, 펌프적산전력계, 기타 중 하나만 허용) /입력값:${rain.spwtPositn}`
+        );
+      }
+    
+
       rain.rainyDetails?.forEach((key) => {
         if (key.ph?.length > 1 && isInvalidNumber(key.ph)) {
-          issues.push(defaultMessage + `PH: 숫자 형식 아님 (${key.ph})`);
+          issues.push(defaultMessage + `PH: 숫자 형식 아님 /입력값:${key.ph}`);
         }
         if (key.trbt?.length > 1 && isInvalidNumber(key.trbt)) {
-          issues.push(defaultMessage + `탁도: 숫자 형식 아님 (${key.trbt})`);
+          issues.push(defaultMessage + `탁도: 숫자 형식 아님 /입력값:${key.trbt}`);
         }
         if (key.grssClfg?.length > 1 && isInvalidNumber(key.grssClfg)) {
           issues.push(
-            defaultMessage + `총대장균군수: 숫자 형식 아님 (${key.grssClfg})`
+            defaultMessage + `총대장균군수: 숫자 형식 아님 /입력값:${key.grssClfg}`
           );
         }
         if (key.levyAmt?.length > 1 && isInvalidNumber(key.levyAmt)) {
           issues.push(
             defaultMessage +
-              `과태료부과금액(천원): 숫자 형식 아님 (${key.levyAmt})`
+              `과태료부과금액(천원): 숫자 형식 아님 /입력값:${key.levyAmt}`
           );
         }
         if (key.vltnDt?.length > 2 && isInvalidDate(key.vltnDt)) {
           issues.push(
             defaultMessage +
-              `과태료 부과일(위반일): 날짜 형식 아님 (${key.vltnDt})`
+              `과태료 부과일(위반일): 날짜 형식 아님 /입력값:${key.vltnDt}`
           );
         }
       });
@@ -188,17 +214,19 @@ export const excelToRainChkData = (excelData: any, year: string) => {
         if (isInvalidNumber(guide.splyUswtrUtztnQnt)) {
           issues.push(
             defaultMessage +
-              `대체_${mm}: 숫자 형식 아님 (${guide.splyUswtrUtztnQnt})`
+              `대체_${mm}: 숫자 형식 아님 /입력값:${guide.splyUswtrUtztnQnt}`
           );
         }
         if (isInvalidNumber(guide.ruseFcltUtztnQnt)) {
           issues.push(
             defaultMessage +
-              `빗물_${mm}: 숫자 형식 아님 (${guide.ruseFcltUtztnQnt})`
+              `빗물_${mm}: 숫자 형식 아님 /입력값:${guide.ruseFcltUtztnQnt}`
           );
         }
       });
     });
+  }else{
+    toast.error("데이터가 없습니다. 점검 데이터를 확인해주세요.");
   }
 
   if (issues.length > 0) {

apps/wr/app/store/prfmncReg/chkgdnReg/rswrtChkgdn/excel.tsx

@@ -1,5 +1,10 @@
 import type { SelectDataType } from "@common/business_components/ui";
-import { useTypes, type Buildingtype } from "../rainChkgdn/excel";
+import {
+  chkMngType,
+  chkSpwtPositnType,
+  useTypes,
+  type Buildingtype,
+} from "../rainChkgdn/excel";
 import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
 import type { rswtChkZodType } from ".";
 import {
@@ -171,14 +176,14 @@ export const excelToRswtGuideData = (
     .filter((el: any) => el !== undefined);
 
   if (rswtChkgdData.length > 0) {
-    rswtExcelDataCheck(rswtChkgdData,issues)
+    rswtExcelDataCheck(rswtChkgdData, issues);
   }
 
   if (issues.length > 0) {
     return { data: [], issues };
   }
 
-  return { data:rswtChkgdData, issues: [] };
+  return { data: rswtChkgdData, issues: [] };
 };
 
 export const excelToRswtPolution = (excelData: any, issues: string[]) => {
@@ -248,25 +253,25 @@ export const excelToRswtPolution = (excelData: any, issues: string[]) => {
     })
     .filter((el: any) => el !== undefined);
   if (rswtChkgdData.length > 0) {
-    rswtExcelDataCheck(rswtChkgdData,issues)
+    rswtExcelDataCheck(rswtChkgdData, issues);
   }
 
   if (issues.length > 0) {
     return { data: [], issues };
   }
 
-  return { data:rswtChkgdData, issues: [] };
+  return { data: rswtChkgdData, issues: [] };
 };
 
-
-const rswtExcelDataCheck=(rswtChkgdData:rswtChkZodType[],  issues:string[]) =>{
+const rswtExcelDataCheck = (
+  rswtChkgdData: rswtChkZodType[],
+  issues: string[]
+) => {
   rswtChkgdData.forEach((rswt: any) => {
     const defaultMessage = `*중수도 수질  [NO: ${rswt.bdstRuseFcltSn}, 점검일: ${rswt.chckYmd}, 이용용도: ${rswt.utztnUsgCd}] 항목에서  `;
 
     if (rswt.chckYmd && isInvalidDate(rswt.chckYmd)) {
-      issues.push(
-        defaultMessage + `점검일: 날짜 형식 아님 (${rswt.chckYmd})`
-      );
+      issues.push(defaultMessage + `점검일: 날짜 형식 아님 (${rswt.chckYmd})`);
     }
     if (rswt.anlOperCst.length > 2 && isInvalidNumber(rswt.anlOperCst)) {
       issues.push(
@@ -279,6 +284,25 @@ const rswtExcelDataCheck=(rswtChkgdData:rswtChkZodType[],  issues:string[]) =>{
         defaultMessage + ` 처리용량(m³): 숫자 형식 아님 (${rswt.prcsCpct})`
       );
     }
+    if (
+      rswt.oilqMeasMthd.length > 1 &&
+      !chkMngType.includes(rswt.oilqMeasMthd)
+    ) {
+      issues.push(
+        defaultMessage +
+          `유량측정방법:  위탁 혹은 자체 만 허용) /입력값:${rswt.oilqMeasMthd}`
+      );
+    }
+    if (
+      rswt.spwtPositn.length > 1 &&
+      !chkSpwtPositnType.includes(rswt.spwtPositn)
+    ) {
+      issues.push(
+        defaultMessage +
+          `측정위치: 유량계, 수위계, 펌프적산전력계, 기타 중 하나만 허용) /입력값:${rswt.spwtPositn}`
+      );
+    }
+
     if (rswt?.rswtrPollutions && rswt?.rswtrPollutions.length > 0) {
       rswt.rswtrPollutions.forEach((pol) => {
         if (isInvalidNumber(pol.grssClfgUswtr)) {
@@ -301,8 +325,7 @@ const rswtExcelDataCheck=(rswtChkgdData:rswtChkZodType[],  issues:string[]) =>{
         }
         if (isInvalidNumber(pol.bod)) {
           issues.push(
-            defaultMessage +
-              `${pol.node}분기_BOD: 숫자 형식 아님 (${pol.bod})`
+            defaultMessage + `${pol.node}분기_BOD: 숫자 형식 아님 (${pol.bod})`
           );
         }
         if (isInvalidNumber(pol.smll)) {
@@ -319,8 +342,7 @@ const rswtExcelDataCheck=(rswtChkgdData:rswtChkZodType[],  issues:string[]) =>{
         }
         if (isInvalidNumber(pol.tph)) {
           issues.push(
-            defaultMessage +
-              `${pol.node}분기_T-P: 숫자 형식 아님 (${pol.tph})`
+            defaultMessage + `${pol.node}분기_T-P: 숫자 형식 아님 (${pol.tph})`
           );
         }
         if (isInvalidNumber(pol.tn)) {
@@ -358,7 +380,5 @@ const rswtExcelDataCheck=(rswtChkgdData:rswtChkZodType[],  issues:string[]) =>{
         }
       });
     }
-  })
-
-
-}
+  });
+};