|
@@ -208,7 +208,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers |
|
|
public ActionResult GetMajorStatistics(string queryJson) |
|
|
public ActionResult GetMajorStatistics(string queryJson) |
|
|
{ |
|
|
{ |
|
|
var Data = stuVolunteerIBLL.GetMajorStatistics(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, |
|
|
DeptNo = x.FirstOrDefault()?.DeptNo, |
|
|
MajorNo = x.FirstOrDefault()?.MajorNo, |
|
|
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), |
|
|
WillNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true), |
|
|
ManNum = x.Count(s => s.IsEnroll == true && s.IsSubmit == true && s.Sex == "1"), |
|
|
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") |
|
|
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); |
|
|
return Success(list); |
|
|
} |
|
|
} |
|
|
#endregion |
|
|
#endregion |
|
|