Commit 2dda2e10 by lizefeng

fix

parent 62534272
......@@ -368,31 +368,28 @@ namespace AutoTurnOver.DB
var allDatas = datas.GroupBy(s => new { s.sku, s.project,s.field_type,s.field }).OrderBy(s => s.Key.field_type);
foreach (var item in allDatas.Take(limit).Skip(offset))
{
foreach (var itemField in enumList)
deviation_view_dto itemData = new deviation_view_dto()
{
deviation_view_dto itemData = new deviation_view_dto()
{
field = item.Key.field,
field_type = item.Key.field_type,
group_key = item.Key.sku,
project = item.Key.project,
month1 = GetVal(item.AsQueryable(), $"{year}-01"),
month2 = GetVal(item.AsQueryable(), $"{year}-02"),
month3 = GetVal(item.AsQueryable(), $"{year}-03"),
month4 = GetVal(item.AsQueryable(), $"{year}-04"),
month5 = GetVal(item.AsQueryable(), $"{year}-05"),
month6 = GetVal(item.AsQueryable(), $"{year}-06"),
month7 = GetVal(item.AsQueryable(), $"{year}-07"),
month8 = GetVal(item.AsQueryable(), $"{year}-08"),
month9 = GetVal(item.AsQueryable(), $"{year}-09"),
month10 = GetVal(item.AsQueryable(), $"{year}-10"),
month11 = GetVal(item.AsQueryable(), $"{year}-11"),
month12 = GetVal(item.AsQueryable(), $"{year}-12")
};
viewDatas.Add(itemData);
}
field = item.Key.field,
field_type = item.Key.field_type,
group_key = item.Key.sku,
project = item.Key.project,
month1 = GetVal(item.AsQueryable(), $"{year}-01"),
month2 = GetVal(item.AsQueryable(), $"{year}-02"),
month3 = GetVal(item.AsQueryable(), $"{year}-03"),
month4 = GetVal(item.AsQueryable(), $"{year}-04"),
month5 = GetVal(item.AsQueryable(), $"{year}-05"),
month6 = GetVal(item.AsQueryable(), $"{year}-06"),
month7 = GetVal(item.AsQueryable(), $"{year}-07"),
month8 = GetVal(item.AsQueryable(), $"{year}-08"),
month9 = GetVal(item.AsQueryable(), $"{year}-09"),
month10 = GetVal(item.AsQueryable(), $"{year}-10"),
month11 = GetVal(item.AsQueryable(), $"{year}-11"),
month12 = GetVal(item.AsQueryable(), $"{year}-12")
};
viewDatas.Add(itemData);
}
total = allDatas.Count();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment