diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs index 1ccdc9ec..9db17301 100644 --- a/ZR.Service/mes/qc/QCStatisticsService.cs +++ b/ZR.Service/mes/qc/QCStatisticsService.cs @@ -72,9 +72,10 @@ namespace ZR.Service.mes.qc List data = Context .Queryable() .Where(predicate) - .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc) + .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc) .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc) + .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc) .OrderBy(it => it.WorkorderId) .OrderBy(it => it.Remark2) @@ -155,9 +156,9 @@ namespace ZR.Service.mes.qc List data = Context .Queryable() .Where(predicate) - .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc) .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc) + .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc) .OrderBy(it => it.WorkorderId) .OrderBy(it => it.Remark2) @@ -238,9 +239,9 @@ namespace ZR.Service.mes.qc List data = Context .Queryable() .Where(predicate) - .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc) .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc) + .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc) .OrderBy(it => it.WorkorderId) .OrderBy(it => it.Remark2) @@ -321,9 +322,9 @@ namespace ZR.Service.mes.qc List data = Context .Queryable() .Where(predicate) - .OrderByIF(sortType == 0, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 1, it => it.QualifiedRate, OrderByType.Desc) .OrderByIF(sortType == 2, it => it.ProductDescription, OrderByType.Asc) + .OrderByIF(sortType == 0 || sortType == 2, it => it.StartTime, OrderByType.Asc) .OrderByIF(sortType == 3, it => it.FinishedPartNumber, OrderByType.Asc) .OrderBy(it => it.WorkorderId) .OrderBy(it => it.Remark2)