하수재이용 오류 수정중

2025-06-26 10:06:20 +09:00
parent 0200cc019e
commit 60bc81b462
6 changed files with 159 additions and 150 deletions
@@ -105,7 +105,7 @@ export default function RuseCaseMng() {
                </div>
                <div className="grid grid-cols-6 gap-4 ">
                    <div className="col-span-6">
-                        <ListDiv>
+                        <ListDiv className="overflow-x-auto">
                            <UiTable
                                headName={"물재이용사례 현황"}
                                tableData={[]}
@@ -16,15 +16,8 @@ import { Button, Label } from "@common/components/ui";
 import HeadChModal from "@/components/ui/modal/sttn/headChModal/headChModal";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { HeadMakeColSpan } from "@common/business_components/ui/table/HeadMakeColSpan";
-import type {
-  customPbnst,
-  pubHasuType,
-} from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
-import {
-  excelDownload,
-  getCityOrSgg,
-  yearOptions,
-} from "@/components/lib/func/commom";
+import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type";
+import { excelDownload, yearOptions } from "@/components/lib/func/commom";
 import SearchInputText from "@/components/ui/searchInput/searchInput";
 import type { WaterReuseFacility } from "@/app/store/ruseFcltMng/fcltSttn/pbnstSttn/type";
 import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal";
@@ -43,7 +36,6 @@ export default function PbnstSttn() {
  const [searchYear, setSearchYear] = useState<string>(
    String(new Date().getFullYear())
  );
-  const [pageNation, setPageNation] = useState(1);
  const [isChHead, setIsChHead] = useState(false);
  const [bdstTable, setBdstTable] = useState<WaterReuseFacility[]>();
  const [pbnDetaileData, setPbnDetaileData] = useState<{
@@ -87,14 +79,17 @@ export default function PbnstSttn() {
    }
  }, [pbnstSttn.isInit, pbnSttnInit, ref.current]);
  useEffect(() => {
-
    setBdstTable(pbnstSttn.pbnstSttnRes);
  }, [pbnstSttn.pbnstSttnRes]);

-  useEffect(() => {
-    if (pbnRuseNm.length > 1)
-      pbnNmSearch("1", "23", ref.current, pbnRuseNm, searchYear);
-  }, [pbnRuseNm]);
+  // useEffect(() => {
+  //   pbnstSttnSearch("1", "20", ref.current, pbnRuseNm, searchYear);
+  // }, [pageNation, ref.current, pbnRuseNm, searchYear, pbnstSttnSearch]);
+
+  // useEffect(() => {
+  //   if (pbnRuseNm.length > 1)
+  //     pbnNmSearch(String(pageNation), "23", ref.current, pbnRuseNm, searchYear);
+  // }, [pbnRuseNm,pageNation]);

  useEffect(() => {
    if (pbnstSttn.pbnstDetail.pbnstRuseFcltPk)
@@ -104,15 +99,14 @@ export default function PbnstSttn() {
      });
  }, [pbnstSttn.pbnstDetail]);

-
-  useEffect(() => { 
-      console.log('pbnDetaileData.isModal ', pbnDetaileData.isModal)
-},[pbnDetaileData.isModal])
+  useEffect(() => {
+    console.log("pbnDetaileData.isModal ", pbnDetaileData.isModal);
+  }, [pbnDetaileData.isModal]);
  return (
    <>
      <ContentsDiv>
-        <div className="grid grid-cols-4 gap-4 ">
-          <div className="col-span-4">
+        <div className="grid grid-cols-2 gap-4 ">
+          <div className="col-span-2">
            <Title title={"하수재이용 시설 현황"} />
            <SearchBaseForm
              selectSidoData={code.cityCd}
@@ -132,41 +126,32 @@ export default function PbnstSttn() {
                </Button>
              }
              leftChildren={
-                <>
-                  <div className="flex flex-row space-x-2">
-                    <SelectBox
-                      className="w-48 h-full text-2xl"
-                      label="연도"
-                      selectClass={""}
-                      selectArray={yearOptions}
-                      value={searchYear}
-                      onSelectValue={(val: string | number) =>
-                        setSearchYear(String(val))
-                      }
-                    />
-                  </div>
-                  <SearchInputText
-                    label={"하수처리시설"}
-                    initValue={pbnRuseNm ?? ""}
-                    setValue={(searchNm?: string) => {
-                      setPbnRuseNm(searchNm || "");
-                    }}
-                    setRtnData={function (rtnData: any[]): void {
-                      setBdstTable(rtnData);
-                    }}
-                    searchList={pbnstSttn.pbnstSearchData || []}
-                  ></SearchInputText>
-                </>
+                <div className="col-span-3 flex items-center">
+                <SelectBox
+                  className="w-48 h-full text-2xl"
+                  label="연도"
+                  selectClass={"w-full "}
+                  selectArray={yearOptions}
+                  value={searchYear}
+                  onSelectValue={(val: string | number) =>
+                    setSearchYear(String(val))
+                  }
+                />
+                <Label className="w-64 mt-2 mx-4 text-xl text-gray-600">
+                  {"하수처리시설명 "}
+                </Label>
+                <SearchInput
+                  className={"text-2xl w-full  ㅍ"}
+                  label=""
+                  textValue={pbnRuseNm || ""}
+                  setText={(e) => {
+                    setPbnRuseNm(e || "");
+                  }}
+                />
+              </div>
              }
              queryClick={function (returnType: ReturnType): void {
-                // '{partValue: 'A', sidoValue: '0', sigunValue: '0', regionValue: '0', unitWaterShedValue: '0', …}'
-                let con;
-                if (returnType.sigunValue != "0") {
-                  con = returnType.sigunValue;
-                } else {
-                  con = returnType.sidoValue;
-                }
-                // pbnstSttnSearch(1, "20", con);
+                pbnstSttnSearch("1", "20", returnType, pbnRuseNm, searchYear);
              }}
              excelClick={excelClick}
              initClick={function (): void {}}
@@ -191,7 +176,15 @@ export default function PbnstSttn() {
                cellClick={(index: number | undefined, headId: string) => {
                  cellCLick(index);
                }}
-                onPageChange={setPageNation}
+                onPageChange={(page: number) => {
+                  pbnstSttnSearch(
+                    String(page),
+                    String(13),
+                    ref.current,
+                    pbnRuseNm,
+                    searchYear
+                  );
+                }}
              ></UiTable>
            </ListDiv>
          </div>
@@ -33,7 +33,7 @@ export type pbnstPrfmncType = pbnstPrfmncState & pbnstPrfmncActions;

 type pbnstPrfmncActions = {
  prfmncHasuInit: (page: string, sggOrCity: string) => void;
-  prfmnRegData:  (data:PrfType) =>void
+  prfmnRegData: (data: PrfType) => void;
 };

 const checkWrRegList = async () => {
@@ -47,21 +47,28 @@ const hasuListFetch = async (page: string, sggOrCity: string) => {
    checkWrRegListRes?.fcltCds,
    fetchType.COMMON
  );
-  const data = checkWrRegListRes.fcPrfList.map((item: FcPrfType) => {
-    const findData = rainRes.data.find(
-      (fclt: pubHasuType) =>
-        fclt.bscFctCd === item.pbnstRuseFcltPk.substring(0, 11)
+
+
+  const findData = rainRes.data.map((item: pubHasuType) => {
+    const data = checkWrRegListRes?.fcPrfList.find(
+      (fclt: FcPrfType) =>
+        fclt.pbnstRuseFcltPk.substring(0, 11) === item?.bscFctCd
    );
-    return {
-      sido: findData?.sido,
-      gugun: findData?.gugun,
-      bscFctNm: findData?.bscFctNm,
-      ruseUtztnFcltNm: item.ruseUtztnFcltNm,
-      pbnstRuseFcltPk: item.pbnstRuseFcltPk,
-      prfList : item.prfList
-    };
+    if(data !==undefined){
+      return( {
+
+        sido: item.sido,
+        gugun: item.gugun,
+        bscFctNm: item.bscFctNm,
+        bscFctCd: item.bscFctCd,
+        ruseUtztnFcltNm: data.ruseUtztnFcltNm,
+        pbnstRuseFcltPk: data.pbnstRuseFcltPk,
+        prfList: data.prfList,
+      });
+    }
  });
-  return data;
+
+  return findData;
 };
 export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
  set: any
@@ -83,26 +90,21 @@ export const pbnstPrfmncActionsExport: (set: any) => pbnstPrfmncActions = (
        console.log(errorHasu);
      }
    },
-    prfmnRegData: async (data:PrfType,) => {
-      try{
-
+    prfmnRegData: async (data: PrfType) => {
+      try {
        const ressponse = await postFectch(
          "/reuseFc/pubFcPrf",
          data,
          fetchType.WR
        );

-        console.log('ressponse ', ressponse)
-      
-      if(ressponse.status === 200){
-    
-        toast.success("하수재이용 시설 실적 등록이 완료되었습니다.")
-
-      }
-      }catch(e){
-        console.log(e)
-        toast.error("하수재이용 시설 실적 등록이 실패하였습니다.")

+        if (ressponse.status === 200) {
+          toast.success("하수재이용 시설 실적 등록이 완료되었습니다.");
+        }
+      } catch (e) {
+        console.log(e);
+        toast.error("하수재이용 시설 실적 등록이 실패하였습니다.");
      }
    },
  };
@@ -3,7 +3,76 @@ import { getFetch, postFectch, putFectch } from "@/components/lib/api";
 import { z } from "zod";
 import { makeMdfr, makeRstr } from "../bdstReg";

+const validationMessages = {
+  required: (field: string) => `${field}을(를) 입력해주세요.`,
+  requiredSelect: (field: string) => `${field}을(를) 선택해주세요.`,
+  yearFormat: '4자리 연도만 입력하세요',
+};
+
 export const TEST_UUID= '2d4b151d-1828-41e0-91d9-4cd28ea1cc7e'
+
+const rainyObjSchema = z.object({
+  bdstReuseFcltFk: z.number().nullish(),
+  pntfColKnd: z.string().default(""),
+  pntfColArea: z.number().default(0),
+  dtfcltCpct: z.number().default(0),
+  filtrTrtmfctYn: z.string().default("Y").nullish(),
+  filtrTrtmfctCpct: z.number().nullish().default(0),
+  filtrTrtmfctPrs: z.string().default(""),
+  annRnwtQty: z.number().default(0),
+  oilqMeasMthd: z.string().default("").nullish(),
+  rgtr:z.string().nullish(),
+  mdfr:z.string().nullish(),
+}).refine((data) => data.pntfColKnd.length > 0, {
+  message: validationMessages.requiredSelect("종류"),
+  path: ["pntfColKnd"],
+}).refine((data) => data.pntfColArea > 0, {
+  message: validationMessages.required("면적(m³)"),
+  path: ["pntfColArea"],
+});
+
+const reuseBuildingSchema = z.object({
+  bdstRuseFcltPk: z.number().nullish(),
+  bdstInfoFk:z.number().nullish(),
+  instlCmptnDt: z.coerce.date().default(() => new Date()),
+  instlCst: z.number().nullish(),
+  operMngCd: z.string().optional().default(""),
+  anlOperCst: z.number().default(0),
+  instlCstSprtYn: z.string().default("Y"),
+  instlCstSprtAmt:  z.number().nullish(),
+  grntchBdstCertYn: z.string().default("Y"),
+  grntchBdstCertYr: z.string().default("")
+                .refine((year)=> year.length===0 || /^\d{4}$/.test(year),{
+                 message: validationMessages.yearFormat
+                }),
+  grntchBdstCertNo: z.string().default(""),
+  grntchBdstCertGrd: z.string().default(""),
+  crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
+  crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
+  crgRdctAmt: z.number().default(0), // 안쓰는 값
+  ruseFcltFlg: z.string().default(""),
+  bdstUsgCd: z.number().default(0),
+  lawTrgtYn: z.string().default("Y"),
+  rgtr:z.string().nullish(),
+  mdfr:z.string().nullish(),
+  rainyObj: rainyObjSchema.default({})
+}).refine((data) => data.bdstUsgCd > 0, {
+  message: validationMessages.requiredSelect("건축물용도"),
+  path: ["bdstUsgCd"],
+});
+
+const chgBuildingSchema = z.object({
+  bdstInfoFk: z.number().nullish(),
+  archChgPrmsnDt: z.coerce.date({required_error: validationMessages.required("허가일")}),
+  archChgArea: z.string().default("-"),
+  bdstChgNm: z.string().default(""),
+  rgtr:z.string().nullish(),
+  mdfr:z.string().nullish(),
+}).refine(data => data.bdstChgNm.length > 0, {
+  message: validationMessages.requiredSelect("구분"),
+  path: ["bdstChgNm"]
+});
+
 export const rainZod = z.object({
  bdstInfoPk: z.number().optional(),
  ctpvCd: z.number().default(0),
@@ -16,62 +85,9 @@ export const rainZod = z.object({
  archChgArea: z.number().default(0),
  rgtr:z.string().nullish(),
  mdfr:z.string().nullish(),
-  reuseBuilding: z.array(
-    z.object({
-      bdstRuseFcltPk: z.number().nullish(),
-      bdstInfoFk:z.number().nullish(),
-      instlCmptnDt: z.coerce.date().default(() => new Date()),
-      instlCst: z.number().nullish(),
-      operMngCd: z.string().optional().default(""),
-      anlOperCst: z.number().default(0),
-      instlCstSprtYn: z.string().default(""),
-      instlCstSprtAmt:  z.number().nullish(),
-      grntchBdstCertYn: z.enum(["Y", "N"]).nullish(),
-      grntchBdstCertYr: z.string().default("")
-                    .refine((year)=> year.length===0 || /^\d{4}$/.test(year),{
-                     message:'4자리 연도만 입력하세요' 
-                    }),
-      grntchBdstCertNo: z.string().default(""),
-      grntchBdstCertGrd: z.string().default(""),
-      crgRdctYn: z.string().default("N").nullish(), /// 안쓰는 값
-      crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
-      crgRdctAmt: z.number().default(0), // 안쓰는 값
-      ruseFcltFlg: z.string().default(""),
-      bdstUsgCd: z.number().default(0),
-      lawTrgtYn: z.enum(["Y", "N"]),
-      rgtr:z.string().nullish(),
-      mdfr:z.string().nullish(),
-
-      rainyObj: z.object({
-        bdstReuseFcltFk: z.number().nullish(),
-        pntfColKnd: z.string().default(""),
-        pntfColArea: z.number().default(0),
-        dtfcltCpct: z.number().default(0),
-        filtrTrtmfctYn: z.enum(["Y", "N"]).nullish(),
-        filtrTrtmfctCpct: z.number().nullish().default(0),
-        filtrTrtmfctPrs: z.string().default(""),
-        annRnwtQty: z.number().default(0),
-        oilqMeasMthd: z.string().default("").nullish(),
-        rgtr:z.string().nullish(),
-        mdfr:z.string().nullish(),
-
-
-      }).default({})
-    })
-  ).default([]),
-
-  chgBuilding: z.array(
-    z.object({
-      bdstInfoFk: z.number().nullish(),
-      archChgPrmsnDt: z.coerce.date(),
-      archChgArea: z.string().default("-"),
-      bdstChgNm: z.string().default(""),
-      rgtr:z.string().nullish(),
-      mdfr:z.string().nullish(),
-
-    })
-  ).default([])
-});
+  reuseBuilding: z.array(reuseBuildingSchema).default([]),
+  chgBuilding: z.array(chgBuildingSchema).default([])
+})

 export type chgBuilding={
  bdstInfoFk?: number|null,
@@ -254,6 +270,3 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = (
    }
  }}
 
-
-
-
@@ -9,6 +9,7 @@ import { excelPbnstSttnParsing } from "./excel";
 import type { FcPrfType } from "@/app/store/prfmncReg/pbnstPrfmncReg/type";
 import type { ReturnType } from "@common/business_components/ui";
 import type { WaterReuseFacility } from "./type";
+import moment from "moment";

 const pbnstSttHeadList = pbnSttHeadListExport;
 const pbnstSttNodeList = pbnstSttNodeListExport;
@@ -166,8 +167,8 @@ const hasuListFetch = async (
        outUsage: usage.outUsage,
        operMthd: item.operList[0]?.operMthd,
        rprtvBzenty: item.operList[0]?.rprtvBzenty,
-        bgngDt: item.operList[0]?.bgngDt.toLocaleDateString ?? "",
-        endDt: item.operList[0]?.endDt.toLocaleDateString?? "",
+        bgngDt: moment(item.operList[0]?.bgngDt).format("YYYY-MM-DD")  ?? "",
+        endDt: moment(item.operList[0]?.endDt).format("YYYY-MM-DD") ?? "",
        searchNm: findData.bscFctNm,
        searchPk: findData.bscFctCd,
        prfList:item?.prfList??[]
@@ -60,8 +60,10 @@ export default function RainRegForm({
          typeof item?.grntchBdstCertYr === "string"
            ? item?.grntchBdstCertYr
            : "", // null → ""
+          // Ensure enum fields are null if empty string to trigger Zod default
        rainyObj: {
          ...item?.rainyObj,
+            filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn === "" ? null : item?.rainyObj?.filtrTrtmfctYn,
        },
      })),
    };
@@ -243,7 +245,7 @@ export default function RainRegForm({
                      label={""}
                      selectArray={code.yn}
                      onSelectValue={readonly ? () => { } : field.onChange}
-                      value={field.value ?? code.yn[0]?.val}
+                      value={field.value || code.yn[0]?.val}
                      readOnly={readonly}
                    />
                  </FormUi>
@@ -278,12 +280,10 @@ export default function RainRegForm({
                  <FormUi label="처리공정">
                    <Input
                      className={selectClass}
-                      placeholder="1,000,000"
-                      type=""
+                      placeholder=""
+                      type="text"
                      value={field.value ?? ""}
-                      onChange={(e) => {
-                        if (!readonly) handleCommaNumberChange(e, field.onChange);
-                      }}
+                      onChange={field.onChange}
                      readOnly={filtrTrtmfctYn !== "Y"}
                    />
                  </FormUi>