排序
This commit is contained in:
parent
2a9813965f
commit
938de5e6a2
@ -11414,7 +11414,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
|
||||
}
|
||||
k++;
|
||||
}
|
||||
result.Data = result.Data.OrderBy(t=>t.MOULD_NAME == "双重预防机制").ThenBy(t => t.MOULD_NAME == "作业现场安全管理").ThenBy(t => t.MOULD_NAME == "安全教育与培训").ThenBy(t => t.NUM).ToList();
|
||||
result.Data = result.Data.OrderBy(t=>t.MOULD_NAME == "安全教育与培训").ThenBy(t => t.MOULD_NAME == "作业现场安全管理").ThenBy(t => t.MOULD_NAME == "双重预防机制").ThenBy(t => t.NUM).ToList();
|
||||
TaskViewInfo infoLast = new TaskViewInfo();
|
||||
infoLast.COMPANY_NAME = filter.Keyword;
|
||||
infoLast.MOULD_NAME = "";
|
||||
@ -11425,8 +11425,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
|
||||
infoLast.DOING = result.Data.Sum(t => t.DOING);
|
||||
infoLast.UNFINISH = result.Data.Sum(t => t.UNFINISH);
|
||||
infoLast.OVER_UNFINISH = result.Data.Sum(t => t.OVER_UNFINISH);
|
||||
infoLast.FINISH_RATE = infoLast.TOTAL_QTY == 0 ? "0" : ((double)(infoLast.NORMAL_FINISH + infoLast.OVER_FINISH) / infoLast.TOTAL_QTY * 100).ToString("0.00");
|
||||
infoLast.NORMAL_RATE = infoLast.TOTAL_QTY == 0 ? "0" : ((double)infoLast.NORMAL_FINISH / infoLast.TOTAL_QTY * 100).ToString("0.00");
|
||||
infoLast.FINISH_RATE = infoLast.TOTAL_QTY == 0 ? "0.00" : ((double)(infoLast.NORMAL_FINISH + infoLast.OVER_FINISH) / infoLast.TOTAL_QTY * 100).ToString("0.00");
|
||||
infoLast.NORMAL_RATE = infoLast.TOTAL_QTY == 0 ? "0.00" : ((double)infoLast.NORMAL_FINISH / infoLast.TOTAL_QTY * 100).ToString("0.00");
|
||||
infoLast.NUM = k;
|
||||
result.Data.Add(infoLast);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user