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

--bug fix--

develop
易大师 2021-06-29 19:01:46 +08:00
parent 585fbcdd02
commit ba85f3709d
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
New_College.Api/New_College.Model.xml
View File

@ -3284,6 +3284,16 @@
霍兰德如果不传周期Id的话就获取最新的
</summary>
</member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.Score">
<summary>
学生分数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.Ranking">
<summary>
学生位次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.RecommendUniversityQuery.SubjectLevel">
<summary>
学科层次

8
New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs
View File

@ -8,8 +8,16 @@ namespace New_College.Model.ViewModels
{
public int CustomerId { get; set; }
/// <summary>
/// 学生分数
/// </summary>
public float Score { get; set; }
/// <summary>
/// 学生位次
/// </summary>
public int Ranking { get; set; }
/// <summary>
/// 学科层次
/// </summary>

4
New_College.Model/ViewModels/Result/UniversityResult.cs
View File

@ -105,11 +105,11 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 最低录取分数
/// </summary>
public int ScoreLine { get; set; }
public float ScoreLine { get; set; }
/// <summary>
/// 位次
/// </summary>
public int Scorepostion { get; set; }
public float Scorepostion { get; set; }
}

10
New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
View File

@ -53,15 +53,16 @@ namespace New_College.Repository
}
var recommendInfo = await this.Db.Queryable<T_EnrollmentPlanedesc, D_University>((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<UniversityResult>()