From 005bb4751c8ea2898131a09f847ba553e2d6c997 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 20 Jun 2024 15:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/MES/andon/AndonDataAnalysisServcie.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs b/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs index 089b5c5..56a7104 100644 --- a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs +++ b/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs @@ -123,7 +123,7 @@ namespace ZR.Service.MES.andon .AndIF(query.DateTimeRange.Count() == 2 && query.DateTimeRange[0] > DateTime.MinValue, it => it.StartTime <= query.DateTimeRange[1]); List InitData = Context.Queryable().Where(predicate.ToExpression()).ToList(); - List Xdata = GetOccupiedDates(query.DateTimeRange[0], query.DateTimeRange[0]); + List Xdata = GetOccupiedDates(query.DateTimeRange[0], query.DateTimeRange[1]); @@ -143,7 +143,7 @@ namespace ZR.Service.MES.andon { DateTime midnight = GetMidnightTime(xdata); DateTime noon = GetNoonTime(xdata); - Data[Xdata.IndexOf(xdata)] =InitData.Where(it => it.StartTime >= noon && it.StartTime <= midnight).Sum(it=>it.Duration); + Data[Xdata.IndexOf(xdata)] =InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Sum(it=>it.Duration); exceptionDistributionResult.ExceptionTimeTotal = exceptionDistributionResult.ExceptionTimeTotal+ Data[Xdata.IndexOf(xdata)]; } EveTIME.Data = Data; @@ -163,7 +163,7 @@ namespace ZR.Service.MES.andon { DateTime midnight = GetMidnightTime(xdata); DateTime noon = GetNoonTime(xdata); - Data[Xdata.IndexOf(xdata)] = InitData.Where(it => it.StartTime >= noon && it.StartTime <= midnight).Count(); + Data[Xdata.IndexOf(xdata)] = InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Count(); exceptionDistributionResult.ExceptionNumTotal = exceptionDistributionResult.ExceptionNumTotal+Data[Xdata.IndexOf(xdata)]; } EveTNUM.Data = Data;