From 918501861f8f2fd4e7eb5d3cb1c51ca10035e73a Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Mon, 17 Jun 2024 15:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=BA=E5=91=98=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=8A=98=E7=BA=BF=E5=9B=BE9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/MES/dev/DeviceDataAnalysisService.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs b/ZR.Service/MES/dev/DeviceDataAnalysisService.cs index 824d324..93f5e8d 100644 --- a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs +++ b/ZR.Service/MES/dev/DeviceDataAnalysisService.cs @@ -430,6 +430,9 @@ namespace ZR.Service.MES.dev var predicate = Expressionable.Create() .AndIF(devicedefault.searchTime[0] > new DateTime(1991, 1, 1), (r) => r.CreatedTime >= devicedefault.searchTime[0]) .AndIF(devicedefault.searchTime[1] > new DateTime(1991, 1, 1), (r) => r.CreatedTime <= devicedefault.searchTime[1]) + .And(it=>it.DistributedTime!=DateTime.MinValue) + .And(it=>it.StartTime!=DateTime.MinValue) + .And(it=>it.EndTime!=DateTime.MinValue) .ToExpression(); List InitDataCollection = Context