From 340ea9c470bdb014d42f4248fed5dcfe612d51b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Thu, 28 Mar 2024 14:10:37 +0800
Subject: [PATCH] bug fixed

---
 .../BASE/T_EnrollmentPlanedescRepository.cs           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
index 1a7e85f..7acef08 100644
--- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
+++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
@@ -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.Append(" order by _23Score");
+            sqlstr.Append(" order by _23ScoreLine ");
 
             var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync();
 
@@ -290,12 +290,12 @@ namespace New_College.Repository
             var ulist = new List<UniversityEnrollmentPlanResult>();
             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);
                     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,
                         AreaName = recommendFirstModel.Province,
                         UniversityCode = recommendFirstModel.EnrollmentCode,
@@ -324,7 +324,7 @@ namespace New_College.Repository
                 msg = "获取成功",
                 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,
                     page = query.PageIndex,
                     PageSize = query.PageSize,
@@ -349,6 +349,7 @@ namespace New_College.Repository
             //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;
             //}
+            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 })
                  .Where((plans, universitys) => plans.Location == query.Location)
                       .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(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 - 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)))
                 .OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc)
                 .Select((plans, universitys) => new UniversityResult()