Merge commit '074d99aa66bbc4a730af2fade7fdcfa725931460' into iipbs/wr/dev

apps/wr/app/matMng/coMat/ruseRvwHstry/page.tsx

@@ -137,7 +137,7 @@ export default function RuseRvwHstry() {
   const confrirmToast = () => {
     const completeData = rvwHistData
       ?.map((item) => {
-        form.clearErrors;
+        form.clearErrors();
         if (item?.completeYn) {
           return Number(item.dmdInfoSn);
         }
@@ -153,7 +153,7 @@ export default function RuseRvwHstry() {
           <button
             onClick={() => {
               toast.dismiss(t.id);
-              ruseRvwComplete(completeData as Number[]);
+              ruseRvwComplete(completeData as number[]);
             }}
           >
             확인
@@ -162,7 +162,7 @@ export default function RuseRvwHstry() {
         </span>
       ));
     } else {
-      ruseRvwComplete(completeData as Number[]);
+      ruseRvwComplete(completeData as number[]);
     }
   };
   useEffect(() => {

apps/wr/app/store/common/code/index.ts

@@ -5,7 +5,6 @@ export const btnClass = "p-4 m-2 text-white rounded-sm text-lg font-medium "
 
 
 const laeSecd = '41'
-const ogdpSeCd = '0'
 
 
 export const buildingType = {

apps/wr/app/store/common/searchCode/index.ts

@@ -177,6 +177,7 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
 
         });
       }catch (e) {
+        console.log('getConstCostFee  ', e)
       }
 
     }

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

@@ -1,7 +1,6 @@
 import type { SelectDataType } from "@common/business_components";
 import type { rainChkZodType } from ".";
 import { TEST_UUID } from "@/app/store/ruseFcltMng/fcltReg/rainReg";
-import { buildingType } from "../../../common/code/index";
 export const useTypes = [
   "조경용수",
   "청소화장실용수",
@@ -85,7 +84,7 @@ export const buildingToExcelType = (
 };
 
 export const excelToRainChkData = (excelData: any, year: string) => {
-  const errors: string[] = [];
+ // const errors: string[] = [];
   const rainChkgdData: rainChkZodType[] = excelData.map((item: any) => {
     if (item["점검일"] !== undefined) {
       const checkYmd = item["점검일"].replace(/\./g, "")

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

@@ -107,7 +107,7 @@ export const rainChkgdnStateExport: rainChkgdnState = {
   },
 };
 
-const makeMdfrChk = (data: rainChkZodType[], type: string, toDo: string) => {
+const makeMdfrChk = (data: rainChkZodType[], type: string) => {
   const chData = data.map((item) => {
     item.mdfr = TEST_UUID;
     item.rgtr = TEST_UUID;
@@ -171,7 +171,6 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
       try {
         const res = await postFectch("/reuseChk/rainy", excelData);
         if (res.status === 200) {
-          const currentYear = new Date().getFullYear().toString();
           const rainChkRes = await initFetch(
             1,
             rainPageSize,
@@ -257,7 +256,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
     },
     rainChkDetilUpdate: async (rainChk: rainChkZodType[] ,year:string) => {
       try {
-        const chData = await makeMdfrChk(rainChk, "rain", "rainDetil");
+        const chData = await makeMdfrChk(rainChk, "rain");
 
         const res = await putFectch("/reuseChk/rainy/list", chData);
         if (res) {
@@ -313,6 +312,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
 
         }
       } catch (error) {
+        console.log(' 지도점검 수질 및 과태료 수정 오류', error)
         toast.error("지도점검 수질 및 과태료 수정 오류입니다.");
       }
     },
@@ -342,6 +342,8 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
 
         }
       } catch (error) {
+        console.log(' 삭제시 오류가 발생하였습니다', error)
+
         toast.error("삭제시 오류가 발생하였습니다.. ");
       }
     },

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

@@ -164,7 +164,7 @@ export const excelToRswtGuideData = (excelData: any, year: string) => {
   return rainChkgdData;
 };
 
-export const excelToRswtPolution = (excelData: any, year: string) => {
+export const excelToRswtPolution = (excelData: any) => {
   const rainChkgdData: rswtChkZodType[] = excelData
     .map((item: any) => {
       if (item["점검일"] !== undefined) {
@@ -177,7 +177,7 @@ export const excelToRswtPolution = (excelData: any, year: string) => {
 
 
         const makePoluttion = Array.from({ length: 4 }, (_, i) => {
-          let quarter = `${i+1}`;
+          const quarter = `${i+1}`;
           const grssClfgUswtr = item[`${quarter}분기_총대장균군수`];
           const combResdch = item[`${quarter}분기_결합잔류염소`];
           const trbt = item[`${quarter}분기_탁도`];

apps/wr/app/store/prfmncReg/pbnstPrfmncReg/index.tsx

@@ -3,7 +3,6 @@ import { pbnstPrfmncHeadListExport, monthHeadListExport } from "./headList";
 import type { pubHasuType } from "../../ruseFcltMng/fcltReg/pbnstReg/type";
 import type { FcPrfType, PrfType } from "./type";
 import type { TableUpperProps } from "../../common/type/header";
-import { ToastFormUi } from "@/components/ui/toast/toastFromUi";
 import toast from "react-hot-toast";
 
 const pbnstPrfmncHeadList = pbnstPrfmncHeadListExport;
@@ -16,7 +15,7 @@ export type pbnstPrfmncState = {
     monthHeadList: TableUpperProps[];
     prfmncRes: FcPrfType[];
     prfmncResCount:number;
-    excelList: Number[];
+    excelList: number[];
     pageKey:number
   };
 };
@@ -42,7 +41,7 @@ type pbnstPrfmncActions = {
 };
 
 const checkWrRegList = async (year:string) => {
-  let url =`/reuseFc/pubDetailList`
+  const url =`/reuseFc/pubDetailList`
   if(year&& year.length>0){
   //  url+=`/${year}`
   }

apps/wr/app/store/prfmncReg/pbnstPrfmncReg/type.tsx

@@ -1,5 +1,4 @@
 import { z } from "zod";
-import type { TableUpperProps } from "../../common/type/header";
 import { fcOperSchema } from "../../ruseFcltMng/fcltReg/pbnstReg/type";
 
 
@@ -7,7 +6,7 @@ import { fcOperSchema } from "../../ruseFcltMng/fcltReg/pbnstReg/type";
 type Month = `${1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12}월`;
 
 export type PrfUsageSummary = {
-  구분: string;
+  구분?: string;
   usage: string;
   용수명?: string;
   total: number;

apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx

@@ -243,7 +243,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
     },pbnstRuseFcltUpdate : async(ruseRes:customPbnst[])=>{
       try {
 
-        const response = await putFectch(
+         await putFectch(
           `/reuseFc/pubFc`,
           ruseRes
         );
@@ -254,7 +254,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
     } ,pbnstRuseBizUpdate : async(ruseRes:fcBizType[])=>{
       try {
 
-        const response = await putFectch(
+       await putFectch(
           `/reuseFc/pubFcBiz`,
           ruseRes 
         );
@@ -303,7 +303,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
     },
     fileDownLoad: async (atflCd: string) => {
       try {
-        const response = await getFetch(
+      await getFetch(
           fetchType.CS,
           `/attach-service/api/v1/atflcd/download/${atflCd}`
         );
@@ -328,10 +328,9 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
         console.log(e);
       }
     },getFcOrgwts : async (fcltPkList: string[] ,size:number) => {
-      let url = `/prcsFclt/ruseInfo/1/${size}/A/0/0/1/SW`;
 
       const fcOrgwtsNmList = await postFectch(
-        url,
+        `/prcsFclt/ruseInfo/1/${size}/A/0/0/1/SW`,
         fcltPkList,
         fetchType.COMMON
       );

apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/type.tsx

@@ -1,5 +1,4 @@
 import { z } from "zod";
-import { TEST_UUID } from "../rainReg";
 
 export type customPbnst = z.infer<typeof pbnstRegZod>;
 
@@ -60,7 +59,7 @@ export type PbnstDemandComType = {
   //  dmdInfoFk:string|''
 };
 
-const pubHasuZod = z.object({
+export const pubHasuZod = z.object({
   choose: z.boolean().default(false),
   bscFctCd: z.string(),
   sido: z.string().default(""),
@@ -82,10 +81,6 @@ const zNum = z.preprocess(
   (v) => (v !== null && v !== undefined ? Number(v) : v),
   z.number()
 );
-const zNumGte = z.preprocess(
-  (v) => (v !== null && v !== undefined ? Number(v) : v),
-  z.number().gt(0, { message: "0보다 큰 숫자만 가능합니다" })
-);
 const zNumNullish = zNum.nullish();
 const zNumDefaultZero = zNum.default(0).nullish();