yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

develop
old易 2023-12-25 12:03:39 +08:00
parent d128318dd2
commit 1d6cc74cb9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
View File

@ -241,7 +241,7 @@ namespace New_College.Model.ViewModels
public class OneSubmitGoResponse public class OneSubmitGoResponse
{ {
public string AcademicYear { get; set; }
public int LowScore { get; set; } public int LowScore { get; set; }
public int LowScoreRank { get; set; } public int LowScoreRank { get; set; }
/// <summary> /// <summary>

9
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -248,12 +248,13 @@ namespace New_College.Services
// AcademicYear = c.Years.ToString() // AcademicYear = c.Years.ToString()
}).ToList(); }).ToList();
var responselist = query.data.Select(c => new OneSubmitGoResponse() var responselist = query.data.OrderByDescending(c => c.SelectSubject).Select(c => new OneSubmitGoResponse()
{ {
AreaName = c.AreaName, AreaName = c.AreaName,
fee = c.Free, fee = c.Free,
Major = c.Major, Major = c.Major,
MajorGroup = c.MajorGroup, MajorGroup = c.MajorGroup,
AcademicYear = c.AcademicYear,
MajorRemark = c.Remark, MajorRemark = c.Remark,
planCount = c.PlanCount, planCount = c.PlanCount,
Ownership = c.Ownership, Ownership = c.Ownership,
@ -282,9 +283,9 @@ namespace New_College.Services
}).OrderByDescending(k => k.Year).ToList() }).OrderByDescending(k => k.Year).ToList()
}).ToList(); }).ToList();
//冲稳保比例--待定 //冲稳保比例--待定
var newlist = responselist.Where(c => c.Type == 2).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.LowScore).Take(60).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.LowScore).Take(18).ToList()); newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(18).ToList());
return new PageModel<OneSubmitGoResponse>() return new PageModel<OneSubmitGoResponse>()
{ {