diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs index 18615ad..e0d57c3 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -9888,6 +9888,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController completionSort.shopName = parentInfo.NAME; } } + completionSort.deptType = item.DEPARTMENT_TYPE; + completionSort.num = item.NUM; completionSort.teamDoneCount = coms.Sum(m => m.FINISH_COUNT); completionSort.teamOntimeCount = coms.Sum(m => m.ONTIME_COUNT); completionSort.teamTotalCount = coms.Sum(m => m.TOTAL_COUNT); @@ -9937,7 +9939,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController } } } - ret.retData = completionLists.OrderBy(t => t.shopName).ThenByDescending(m => m.teamOverDoneRate).ToList(); + ret.retData = completionLists.OrderBy(t => t.shopName).ThenBy(m => m.deptType).ThenBy(n=>n.num).ToList(); } return ret; });