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

bug fixed

develop
old易 2024-03-28 14:10:37 +08:00
parent 1f867c7ce4
commit 340ea9c470
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,7 @@ namespace New_College.Repository
{ {
sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' )", claim01, claim02, claim03); sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' )", claim01, claim02, claim03);
} }
sqlstr.Append(" order by _23Score"); sqlstr.Append(" order by _23ScoreLine ");
var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync(); var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync();
@ -290,12 +290,12 @@ namespace New_College.Repository
var ulist = new List<UniversityEnrollmentPlanResult>(); var ulist = new List<UniversityEnrollmentPlanResult>();
universitylist.ForEach(s => universitylist.ForEach(s =>
{ {
if (recommendInfo.Any(e => e.UniversityName == s.UniversityName) && universitytemps.FirstOrDefault(e => e.Name == s.UniversityName)!= null) if (recommendInfo.Any(e => e.UniversityName == s.UniversityName) && universitytemps.FirstOrDefault(e => e.Name == s.UniversityName) != null)
{ {
var recommendFirstModel = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName); var recommendFirstModel = recommendInfo.FirstOrDefault(e => e.UniversityName == s.UniversityName);
ulist.Add(new UniversityEnrollmentPlanResult() ulist.Add(new UniversityEnrollmentPlanResult()
{ {
Logo = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Logo, Logo = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Logo,
UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id, UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id,
AreaName = recommendFirstModel.Province, AreaName = recommendFirstModel.Province,
UniversityCode = recommendFirstModel.EnrollmentCode, UniversityCode = recommendFirstModel.EnrollmentCode,
@ -324,7 +324,7 @@ namespace New_College.Repository
msg = "获取成功", msg = "获取成功",
response = new PageModel<UniversityEnrollmentPlanResult>() response = new PageModel<UniversityEnrollmentPlanResult>()
{ {
data = ulist.OrderByDescending(t => t.Type).OrderBy(t => t.SchoolScoreline).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(), data = ulist.OrderBy(t => t.Percentage).OrderBy(t => t.SchoolScoreline).Skip(query.PageSize * (query.PageIndex - 1)).Take(query.PageSize).ToList(),
dataCount = universitylist.Count, dataCount = universitylist.Count,
page = query.PageIndex, page = query.PageIndex,
PageSize = query.PageSize, PageSize = query.PageSize,
@ -349,6 +349,7 @@ namespace New_College.Repository
//var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId)); //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;
//} //}
query.PageSize = query.PageSize < 100 ? 200 : query.PageSize;
var recommendInfo = await this.Db.Queryable<D_QualificationLine, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id }) var recommendInfo = await this.Db.Queryable<D_QualificationLine, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id })
.Where((plans, universitys) => plans.Location == query.Location) .Where((plans, universitys) => plans.Location == query.Location)
.Where((plans, universitys) => plans.SubjectType == subjecttype) .Where((plans, universitys) => plans.SubjectType == subjecttype)
@ -362,7 +363,7 @@ namespace New_College.Repository
.WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name == query.AreaName) .WhereIF(!string.IsNullOrWhiteSpace(query.AreaName) && query.AreaName != "选择省份", (plans, universitys) => universitys.Area_Name == query.AreaName)
.WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore) .WhereIF(maxscore > 10, (plans, universitys) => plans.LowScore <= maxscore)
.WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore) .WhereIF(minscore > 0, (plans, universitys) => plans.LowScore > minscore)
.WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking - 6) .WhereIF(query.Ranking > 0, (plans, universitys) => plans.LowScoreRank >= query.Ranking)
// .Where(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SubjectType.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree))) // .Where(!string.IsNullOrWhiteSpace(query.SubjectClaim), (plans, universitys) => (plans.SubjectType.Contains(sbuOne) || plans.SelectSubject.Contains(sbuTwo) || plans.SelectSubject.Contains(sbuTree)))
.OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc) .OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc)
.Select((plans, universitys) => new UniversityResult() .Select((plans, universitys) => new UniversityResult()