bug fixed
parent
d128318dd2
commit
1d6cc74cb9
|
|
@ -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; }
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -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<OneSubmitGoResponse>()
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue