feat:bug fixed
parent
2a97e797c0
commit
d03cb76553
|
|
@ -189,7 +189,7 @@ namespace New_College.Services
|
||||||
public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request)
|
public async Task<PageModel<OneSubmitGoResponse>> GetPlanMajorList(OneSubmitGoRequest request)
|
||||||
{
|
{
|
||||||
|
|
||||||
request.PageSize = 96;//山东省
|
request.PageSize = 300;//山东省
|
||||||
|
|
||||||
|
|
||||||
var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
|
var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||||
|
|
@ -203,7 +203,7 @@ namespace New_College.Services
|
||||||
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
|
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
|
||||||
.And(c => c.Years == request.Year)
|
.And(c => c.Years == request.Year)
|
||||||
.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
|
.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
|
||||||
.AndIF(request.Score > 0, c => SqlFunc.Between(c.LowScore, request.Score - 15, request.Score + 15))
|
.AndIF(request.Score > 0, c => SqlFunc.Between(c.LowScore, request.Score - 150, request.Score + 15))
|
||||||
.AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是")
|
.AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是")
|
||||||
.AndIF(request._211.HasValue && request._211 == 1, c => c._211 == "是")
|
.AndIF(request._211.HasValue && request._211 == 1, c => c._211 == "是")
|
||||||
.AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
|
.AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
|
||||||
|
|
@ -277,7 +277,7 @@ namespace New_College.Services
|
||||||
Count = "--"
|
Count = "--"
|
||||||
|
|
||||||
}).OrderByDescending(k => k.Year).ToList()
|
}).OrderByDescending(k => k.Year).ToList()
|
||||||
}).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList();
|
}).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).Take(96).ToList();
|
||||||
return new PageModel<OneSubmitGoResponse>()
|
return new PageModel<OneSubmitGoResponse>()
|
||||||
{
|
{
|
||||||
data = responselist,
|
data = responselist,
|
||||||
|
|
|
||||||
|
|
@ -1594,7 +1594,7 @@ namespace New_College.Services
|
||||||
if (info.Count <= 0)
|
if (info.Count <= 0)
|
||||||
return new MessageModel<List<IdNameResult>>() { success = false, msg = "数据为空" };
|
return new MessageModel<List<IdNameResult>>() { success = false, msg = "数据为空" };
|
||||||
List<IdNameResult> list = new List<IdNameResult>() { };
|
List<IdNameResult> list = new List<IdNameResult>() { };
|
||||||
foreach (var item in info)
|
foreach (var item in info.OrderByDescending(c=>c.Year).ToList())
|
||||||
{
|
{
|
||||||
if (item.Type != "不分文理")
|
if (item.Type != "不分文理")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue