From dfe7e1653f8309e23e4c314cd58ac4ff7ce49dbc Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
index 8bd8303..b19a39a 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
@@ -1,4 +1,4 @@
-锘縩amespace PBS.WinFrmUI.Box
+锘縩amespace PBS.WinFrmUI.DataAnalysis
{
public class ElecPriceHelper
{
@@ -205,11 +205,13 @@
if (hour == 23)
{
var item = hourList.Find(x => x.EndHour == 23);
+
return el * item.Price;
}
else
{
var item = hourList.Find(x => hour >= x.StartHour && hour < x.EndHour);
+
return el * item.Price;
}
}
--
Gitblit v1.9.3