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