From ba85f3709d44b735ef136f9750b0d1b70455351f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E5=A4=A7=E5=B8=88?= <156663459@qq.com> Date: Tue, 29 Jun 2021 19:01:46 +0800 Subject: [PATCH] --bug fix-- --- New_College.Api/New_College.Model.xml | 10 ++++++++++ .../ViewModels/Query/RecommendUniversityQuery.cs | 8 ++++++++ .../ViewModels/Result/UniversityResult.cs | 4 ++-- .../BASE/T_EnrollmentPlanedescRepository.cs | 10 +++++++--- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml index 19b6ce3..238816c 100644 --- a/New_College.Api/New_College.Model.xml +++ b/New_College.Api/New_College.Model.xml @@ -3284,6 +3284,16 @@ 霍兰德如果不传周期Id的话就获取最新的 + + + 学生分数 + + + + + 学生位次 + + 学科层次 diff --git a/New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs b/New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs index f914d12..5bdbfca 100644 --- a/New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs +++ b/New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs @@ -8,8 +8,16 @@ namespace New_College.Model.ViewModels { public int CustomerId { get; set; } + /// + /// 学生分数 + /// public float Score { get; set; } + /// + /// 学生位次 + /// + public int Ranking { get; set; } + /// /// 学科层次 /// diff --git a/New_College.Model/ViewModels/Result/UniversityResult.cs b/New_College.Model/ViewModels/Result/UniversityResult.cs index 1ef2957..b7b6c7b 100644 --- a/New_College.Model/ViewModels/Result/UniversityResult.cs +++ b/New_College.Model/ViewModels/Result/UniversityResult.cs @@ -105,11 +105,11 @@ namespace New_College.Model.ViewModels /// /// 最低录取分数 /// - public int ScoreLine { get; set; } + public float ScoreLine { get; set; } /// /// 位次 /// - public int Scorepostion { get; set; } + public float Scorepostion { get; set; } } diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index aca9344..a9297bb 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -53,15 +53,16 @@ namespace New_College.Repository } var recommendInfo = await this.Db.Queryable((plans, universitys) => new object[] { JoinType.Left, plans.UniversityId == universitys.Id }) .Where((plans, universitys) => plans.PlanId == planId) - .WhereIF(query.SubjectLevel >= 0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) + .WhereIF(query.SubjectLevel >0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) .WhereIF(query.Type >= 0, (plans, universitys) => universitys.Type == query.Type) .WhereIF(query.Nhef >= 0, (plans, universitys) => universitys.Nhef == query.Nhef) .WhereIF(query.Sff >= 0, (plans, universitys) => universitys.Sff == query.Sff) .WhereIF(query.Syl >= 0, (plans, universitys) => universitys.Syl == query.Syl) .WhereIF(query.Nature > 0, (plans, universitys) => universitys.Nature == query.Nature) - .WhereIF(!string.IsNullOrWhiteSpace(query.AreaName)&&query.AreaName!= "选择省份", (plans, universitys) => universitys.Area_Name.Contains(query.AreaName)) + .WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name.Contains(query.AreaName)) .WhereIF(maxscore > 10, (plans, universitys) => plans.Scoreline <= maxscore) .WhereIF(minscore > 0, (plans, universitys) => plans.Scoreline > minscore) + .WhereIF(query.Ranking > 0, (plans, universitys) => plans.scorepostion >= query.Ranking + 1) .WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.Subjectclaim.Contains(sbuOne) || plans.Subjectclaim.Contains(sbuTwo) || plans.Subjectclaim.Contains(sbuTree))) .OrderBy((plans, universitys) => plans.Scoreline, OrderByType.Desc) .Select((plans, universitys) => new UniversityResult() @@ -70,12 +71,15 @@ namespace New_College.Repository Name = universitys.Name, Nature = universitys.Nature, AscriptionName = universitys.AscriptionName, + SubjectLevel = universitys.Subject_Level, AreaName = universitys.Area_Name, Logo = universitys.Logo, Syl = universitys.Syl == 1 ? true : false, Nhef = universitys.Nhef == 1 ? true : false, Sff = universitys.Sff == 1 ? true : false, - UniversityType = universitys.Type + UniversityType = universitys.Type, + Scorepostion = plans.scorepostion.Value, + ScoreLine = plans.Scoreline }) .ToPageListAsync(query.PageIndex, query.PageSize, totalNumber); return new PageModel()