From be8b354e8506d7ed83b1c619675d24af67ce81aa Mon Sep 17 00:00:00 2001 From: jsyang Date: Tue, 19 Aug 2025 16:51:57 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=95=EC=9A=B0=EC=98=81=ED=96=A5=EC=9D=BC?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20to-be=20:=20?= =?UTF-8?q?=EA=B0=95=EC=9A=B0=EB=9F=89=20=EB=B3=80=EA=B2=BD=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=A4=91=20=EC=96=B4=EB=8A=90=20=EB=82=A0=EC=A7=9C?= =?UTF-8?q?=EA=B0=80=20=EA=B0=95=EC=9A=B0=EC=98=81=ED=96=A5=EC=9D=BC?= =?UTF-8?q?=EC=97=90=20=ED=8F=AC=ED=95=A8=EB=90=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?3=EB=B3=B4=EB=8B=A4=20=ED=81=B0=20=EA=B0=95=EC=9A=B0=EB=9F=89?= =?UTF-8?q?=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=EC=97=90=EB=8A=94=20=EA=B0=95?= =?UTF-8?q?=EC=9A=B0=EB=9F=89=20update=20=EC=95=88=ED=95=98=EA=B3=A0=20?= =?UTF-8?q?=ED=98=84=EC=9E=AC=EC=9D=BC=EC=9E=90=20=EA=B0=95=EC=9A=B0?= =?UTF-8?q?=EB=9F=89=20=EA=B7=B8=EB=8C=80=EB=A1=9C=20=EC=9C=A0=EC=A7=80?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/store/dashboard/index.tsx | 4 ++-- apps/fo/app/store/facilityWaterQlty/index.tsx | 4 ++-- apps/fo/app/store/flowRate/index.tsx | 6 +++--- apps/fo/app/store/sewageOccur/index.tsx | 4 ++-- apps/fo/app/store/underWaterInput/index.tsx | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/fo/app/store/dashboard/index.tsx b/apps/fo/app/store/dashboard/index.tsx index e4b87e853..8ad56e070 100644 --- a/apps/fo/app/store/dashboard/index.tsx +++ b/apps/fo/app/store/dashboard/index.tsx @@ -1031,12 +1031,12 @@ export const calRainEffectDayRainManage = (data: RainManageListProps[]) => { for(let idx = 0; idx < data.length; idx++) { if(data[idx] && data[idx]?.rainEffectDay === 1) { if(idx > 1){ - if(data[idx-1]?.infoRnDay && Number(data[idx-1]?.infoRnDay) >= 3) { + if(data[idx-1]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-1]?.infoRnDay) >= 3) { data[idx]!.infoRnDay = data[idx-1]!.infoRnDay; } } if(idx > 2){ - if(data[idx-2]?.infoRnDay && Number(data[idx-2]?.infoRnDay) >= 3) { + if(data[idx-2]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-2]?.infoRnDay) >= 3) { data[idx]!.infoRnDay = data[idx-2]!.infoRnDay; } } diff --git a/apps/fo/app/store/facilityWaterQlty/index.tsx b/apps/fo/app/store/facilityWaterQlty/index.tsx index 7ea759810..5b7bcf816 100644 --- a/apps/fo/app/store/facilityWaterQlty/index.tsx +++ b/apps/fo/app/store/facilityWaterQlty/index.tsx @@ -604,12 +604,12 @@ export const facilityWaterQltyReducer = (set: (fn: (state: FacilityWaterQltyType for(let idx = 0; idx < data.length; idx++) { if(data[idx] && data[idx]?.rainEffectDay === 1) { if(idx > 1){ - if(data[idx-1]?.infoRnDay && Number(data[idx-1]?.infoRnDay) > 3) { + if(data[idx-1]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-1]?.infoRnDay) >= 3) { data[idx]!.infoRnDay = data[idx-1]!.infoRnDay; } } if(idx > 2){ - if(data[idx-2]?.infoRnDay && Number(data[idx-2]?.infoRnDay) > 3) { + if(data[idx-2]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-2]?.infoRnDay) >= 3) { data[idx]!.infoRnDay = data[idx-2]!.infoRnDay; } } diff --git a/apps/fo/app/store/flowRate/index.tsx b/apps/fo/app/store/flowRate/index.tsx index 52d5fae94..ec64465d0 100644 --- a/apps/fo/app/store/flowRate/index.tsx +++ b/apps/fo/app/store/flowRate/index.tsx @@ -154,7 +154,7 @@ const upHeadListFlowRateModal:TableUpperProps[] = [ { id: "sumFlow", title: "연계처리량(m³/일)", align:"right"}, { id: "returnAmnt", title: "총인 반류수량(m³/일)", align:"right"}, { id: "efflAmnt", title: "방류량(m³/일)", align:"right"}, - /* { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} */ + { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} ] const modalFlowRateListYear:FlowRateModalProps[] = [ @@ -348,12 +348,12 @@ export const flowRateSearchReducer:(set:(fn: (state: FlowRateSearchType) => Flow for(let idx = 0; idx < data.length; idx++) { if(data[idx] && data[idx]?.rainEffectDay === 1) { if(idx > 1){ - if(data[idx-1]?.infoRnDay && Number(data[idx-1]?.infoRnDay.toString().trim()) >= 3) { + if(data[idx-1]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-1]?.infoRnDay.toString().trim()) >= 3) { data[idx]!.infoRnDay = data[idx-1]!.infoRnDay; } } if(idx > 2){ - if(data[idx-2]?.infoRnDay && Number(data[idx-2]?.infoRnDay.toString().trim()) >= 3) { + if(data[idx-2]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-2]?.infoRnDay.toString().trim()) >= 3) { data[idx]!.infoRnDay = data[idx-2]!.infoRnDay; } } diff --git a/apps/fo/app/store/sewageOccur/index.tsx b/apps/fo/app/store/sewageOccur/index.tsx index 4bc5ae225..4a6d055f0 100644 --- a/apps/fo/app/store/sewageOccur/index.tsx +++ b/apps/fo/app/store/sewageOccur/index.tsx @@ -264,12 +264,12 @@ export const sewageOccurReducer:(set:any)=>SewageOccurActions=(set: any) => { for(let idx = 0; idx < res2.data.length; idx++) { if(res2.data[idx] && res2.data[idx]?.rainEffectDay === 1) { if(idx > 1){ - if(res2.data[idx-1]?.infoRnDay && Number(res2.data[idx-1]?.infoRnDay.toString().trim()) >= 3) { + if(res2.data[idx-1]?.infoRnDay && Number(res2.data[idx]?.infoRnDay) < 3 && Number(res2.data[idx-1]?.infoRnDay.toString().trim()) >= 3) { res2.data[idx]!.infoRnDay = res2.data[idx-1]!.infoRnDay; } } if(idx > 2){ - if(res2.data[idx-2]?.infoRnDay && Number(res2.data[idx-2]?.infoRnDay.toString().trim()) >= 3) { + if(res2.data[idx-2]?.infoRnDay && Number(res2.data[idx]?.infoRnDay) < 3 && Number(res2.data[idx-2]?.infoRnDay.toString().trim()) >= 3) { res2.data[idx]!.infoRnDay = res2.data[idx-2]!.infoRnDay; } } diff --git a/apps/fo/app/store/underWaterInput/index.tsx b/apps/fo/app/store/underWaterInput/index.tsx index aaf6a7425..e9c664b99 100644 --- a/apps/fo/app/store/underWaterInput/index.tsx +++ b/apps/fo/app/store/underWaterInput/index.tsx @@ -294,12 +294,12 @@ export const calRainEffectDay = (data: any, weather: string) => { for(let idx = 0; idx < data.length; idx++) { if(data[idx] && data[idx]?.rainEffectDay === 1) { if(idx > 1){ - if(data[idx-1]?.infoRnDay && Number(data[idx-1]?.infoRnDay.toString().trim()) >= 3) { + if(data[idx-1]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-1]?.infoRnDay.toString().trim()) >= 3) { data[idx]!.infoRnDay = data[idx-1]!.infoRnDay; } } if(idx > 2){ - if(data[idx-2]?.infoRnDay && Number(data[idx-2]?.infoRnDay.toString().trim()) >= 3) { + if(data[idx-2]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-2]?.infoRnDay.toString().trim()) >= 3) { data[idx]!.infoRnDay = data[idx-2]!.infoRnDay; } }