Commit 3a7896b7 by lizefeng

fix

parent 494ba7e2
......@@ -365,7 +365,8 @@ namespace AutoTurnOver.DB
var viewDatas = new List<deviation_view_dto>() { };
var year = DateTime.Now.Year;
foreach (var item in datas.GroupBy(s => new { s.sku, s.project, s.field, s.field_type }).OrderBy(s=>s.Key.field_type))
var allDatas = datas.GroupBy(s => new { s.sku, s.project, s.field, s.field_type }).OrderBy(s => s.Key.field_type);
foreach (var item in allDatas.Take(limit).Skip(offset))
{
deviation_view_dto itemData = new deviation_view_dto()
{
......@@ -390,10 +391,10 @@ namespace AutoTurnOver.DB
viewDatas.Add(itemData);
}
total = viewDatas.Count();
var views = viewDatas.Take(limit).Skip(offset);
total = allDatas.Count();
return views;
return viewDatas;
}
public static decimal? GetVal(IQueryable<dc_ana_deviation> list, string date_str)
......@@ -414,7 +415,7 @@ namespace AutoTurnOver.DB
{
var yearBdate = DateTime.Parse(DateTime.Now.ToString("yyyy-01-01 00:00:00"));
var yearEdate = DateTime.Parse(DateTime.Now.ToString("yyyy-12-31 23:59:59"));
var sql = " select * from dc_ana_deviation where bdate<=@yearEdate and edate>=@yearBdate ";
var sql = " select * from dc_ana_deviation as t1 where t1.bdate<=@yearEdate and t1.edate>=@yearBdate ";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("yearBdate", yearBdate);
parameters.Add("yearEdate", yearEdate);
......
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