From 31c6b47c287caa70f7a8ffc99aa06496cc557e92 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 22 Apr 2022 18:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E7=BB=9F=E8=AE=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuVolunteerController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs index a4aa3092c..39b364883 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs @@ -208,7 +208,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetMajorStatistics(string queryJson) { var Data = stuVolunteerIBLL.GetMajorStatistics(queryJson); - var list = Data.GroupBy(x => x.Grade).Select(x => new + var list = Data.GroupBy(x => x.DeptNo).Select(x => new { DeptNo = x.FirstOrDefault()?.DeptNo, MajorNo = x.FirstOrDefault()?.MajorNo, @@ -218,7 +218,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers WillNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true), ManNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true && s.Sex == "1"), WoManNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true && s.Sex == "0") - }); + }).OrderBy(x => x.DeptNo).ThenBy(x=>x.MajorNo).ThenBy(x => x.Grade); return Success(list); } #endregion