|
@@ -693,12 +693,14 @@ namespace GxPress.Api.AppControllers
|
|
|
{
|
|
|
if (orderLists.Any(n => n.TimeKey == item.Date.ToString()))
|
|
|
continue;
|
|
|
- var timeDictionary = new TimeDictionary();
|
|
|
- timeDictionary.TimeKey = item.Date.ToString();
|
|
|
- foreach (var date in orderAllList.Where(n => n.Date == item.Date).OrderBy(n => n.Hour).Select(n => n.Hour).Distinct().ToList())
|
|
|
+ var timeDictionary = new TimeDictionary()
|
|
|
+ {
|
|
|
+ TimeKey = item.Date.ToString(),
|
|
|
+ };
|
|
|
+ foreach (var data in orderAllList.Where(n => n.Date == Convert.ToInt32(item.Date)).Distinct().ToList())
|
|
|
{
|
|
|
- timeDictionary.TimeValues.Add(date);
|
|
|
- timeDictionary.NewTimeValues.Add(new TimeValue { Key = date, Value = item.UserName });
|
|
|
+ timeDictionary.TimeValues.Add(data.Hour);
|
|
|
+ timeDictionary.NewTimeValues.Add(new TimeValue { Key = data.Hour, Value = data.UserName });
|
|
|
}
|
|
|
orderLists.Add(timeDictionary);
|
|
|
}
|