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

feat:细节bug 修复

develop
old易 2023-09-27 11:18:56 +08:00
parent 3a54a7f05a
commit 8dac42926a
6 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2417,6 +2417,11 @@
考生预计分数
</summary>
</member>
<member name="P:New_College.Model.Models.V_CustomerInfo.Rank">
<summary>
分数位次
</summary>
</member>
<member name="P:New_College.Model.Models.V_CustomerInfo.IsVIP">
<summary>
是否为VIP
@ -4400,6 +4405,11 @@
考生预计分数
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CustomerInfoResult.Rank">
<summary>
考生位次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CustomerInfoResult.IsVIP">
<summary>
是否为VIP
@ -5220,6 +5230,11 @@
长学校id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityResult.Years">
<summary>
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityResult.ScoreLine">
<summary>
最低录取分数

5
New_College.Model/Models/V_CustomerInfo.cs
View File

@ -117,6 +117,11 @@ namespace New_College.Model.Models
/// </summary>
public double? Expectedscore { get; set; } = 0;
/// <summary>
/// 分数位次
/// </summary>
public double? Rank { get; set; }
/// <summary>
/// 是否为VIP
/// </summary>

5
New_College.Model/ViewModels/Result/CustomerInfoResult.cs
View File

@ -68,6 +68,11 @@ namespace New_College.Model.ViewModels
/// </summary>
public double? Expectedscore { get; set; } = 0;
/// <summary>
/// 考生位次
/// </summary>
public double? Rank { get; set; }
public string subjectgroupName { get; set; }
/// <summary>

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

@ -107,6 +107,11 @@ namespace New_College.Model.ViewModels
/// </summary>
public string LongSchoolId { get; set; }
/// <summary>
///
/// </summary>
public int Years { get; set; }
/// <summary>
/// 最低录取分数
/// </summary>

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

@ -11,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Numerics;
using System.Threading.Tasks;
namespace New_College.Repository
@ -151,7 +152,7 @@ namespace New_College.Repository
var maxscore = query.Score + 10;
var minscore = query.Score - 10;
var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId));
int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id;
// int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id;
var subjects = new string[] { };
string sbuOne = string.Empty;
@ -164,20 +165,21 @@ namespace New_College.Repository
sbuTwo = subjects[1];
sbuTree = subjects[2];
}
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)
var recommendInfo = await this.Db.Queryable<D_PlanMajorDesc, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id })
.Where((plans, universitys) => plans.Location == custome.AreaName.Replace("省",""))
.Where((plans, universitys) => plans.Years == custome.Year)
.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(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)
.WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore)
.WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore)
.WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking + 1)
.WhereIF(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SelectSubject.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree)))
.OrderBy((plans, universitys) => plans.LowScore, OrderByType.Desc)
.Select((plans, universitys) => new UniversityResult()
{
Id = plans.Id,
@ -191,10 +193,43 @@ namespace New_College.Repository
Nhef = universitys.Nhef == 1 ? true : false,
Sff = universitys.Sff == 1 ? true : false,
UniversityType = universitys.Type,
Scorepostion = plans.scorepostion.Value,
ScoreLine = plans.Scoreline
Scorepostion = plans.LowScoreRank,
ScoreLine = plans.LowScore,
Years=plans.Years
})
.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
// 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.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(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()
//{
// Id = plans.Id,
// 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,
// Scorepostion = plans.scorepostion.Value,
// ScoreLine = plans.Scoreline
//})
//.ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);
return new PageModel<UniversityResult>()
{
data = recommendInfo,

3
New_College.Services/V_CustomerInfoServices.cs
View File

@ -118,7 +118,7 @@ namespace New_College.Services
}
/// <summary>
/// 完善用户信息
/// </summary>
@ -225,6 +225,7 @@ namespace New_College.Services
AreaName = info.AreaName,
Datainit = info.Datainit,
Expectedscore = info.Expectedscore,
Rank = info.Rank,
IsVIP = info.IsVIP,
Subject = info.Subject,
Subjectgroup = info.Subjectgroup,