diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs index 361b243..84e8144 100644 --- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs +++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs @@ -241,7 +241,7 @@ namespace New_College.Model.ViewModels public class OneSubmitGoResponse { - + public string AcademicYear { get; set; } public int LowScore { get; set; } public int LowScoreRank { get; set; } /// diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index 2a6bbc9..fd70c64 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -248,12 +248,13 @@ namespace New_College.Services // AcademicYear = c.Years.ToString() }).ToList(); - var responselist = query.data.Select(c => new OneSubmitGoResponse() + var responselist = query.data.OrderByDescending(c => c.SelectSubject).Select(c => new OneSubmitGoResponse() { AreaName = c.AreaName, fee = c.Free, Major = c.Major, MajorGroup = c.MajorGroup, + AcademicYear = c.AcademicYear, MajorRemark = c.Remark, planCount = c.PlanCount, Ownership = c.Ownership, @@ -282,9 +283,9 @@ namespace New_College.Services }).OrderByDescending(k => k.Year).ToList() }).ToList(); //冲稳保比例--待定 - var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.LowScore).Take(18).ToList(); - newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.LowScore).Take(60).ToList()); - newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.LowScore).Take(18).ToList()); + var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(18).ToList(); + newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(60).ToList()); + newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(18).ToList()); return new PageModel() {