diff --git a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs b/ZR.Service/MES/dev/DeviceDataAnalysisService.cs index 43b58b8..6282022 100644 --- a/ZR.Service/MES/dev/DeviceDataAnalysisService.cs +++ b/ZR.Service/MES/dev/DeviceDataAnalysisService.cs @@ -454,8 +454,8 @@ namespace ZR.Service.MES.dev temp.Id = item.Id; temp.TaskName = item.TaskName; - temp.Accept_response = (item.StartTime ?? DateTime.MinValue) - (item.DistributedTime ?? DateTime.MinValue); - temp.Accept_response = (item.EndTime ?? DateTime.MinValue) - (item.StartTime ?? DateTime.MinValue); + temp.Accept_response = (item.StartTime ?? DateTime.Now) - (item.DistributedTime ?? DateTime.Now); + temp.Accept_response = (item.EndTime ?? DateTime.Now) - (item.StartTime ?? DateTime.Now); SecondDataCollection[index] = temp; index++; @@ -494,7 +494,7 @@ namespace ZR.Service.MES.dev personnelResponseResultDto.TaskMin = SecondDataCollection.Min(it => it.Accept_response); personnelResponseResultDto.TaskAvg = CalculateAverageTimeSpan(SecondDataCollection.Select(it => it.Action_response).ToArray()); personnelResponseResultDto.SeriesData = task_accept_series; - resultDate= SecondDataCollection.Select(it=>it.Accept_response.TotalSeconds).ToArray(); + resultDate= SecondDataCollection.Select(it=>Math.Round(it.Accept_response.TotalMinutes, 2)).ToArray(); } else if (devicedefault.searchType == 2) { @@ -503,7 +503,7 @@ namespace ZR.Service.MES.dev personnelResponseResultDto.TaskMin = SecondDataCollection.Min(it => it.Action_response); personnelResponseResultDto.TaskAvg = CalculateAverageTimeSpan(SecondDataCollection.Select(it => it.Action_response).ToArray()); personnelResponseResultDto.SeriesData = task_action_series; - resultDate = SecondDataCollection.Select(it => it.Action_response.TotalSeconds).ToArray(); + resultDate = SecondDataCollection.Select(it => Math.Round(it.Action_response.TotalMinutes, 2)).ToArray(); } personnelResponseResultDto.XData = XData; personnelResponseResultDto.SeriesData.Data = resultDate;