diff --git a/New_College.Api/Controllers/Front/LibraryController.cs b/New_College.Api/Controllers/Front/LibraryController.cs index 13810d3..87ffe19 100644 --- a/New_College.Api/Controllers/Front/LibraryController.cs +++ b/New_College.Api/Controllers/Front/LibraryController.cs @@ -90,7 +90,7 @@ namespace New_College.Api.Controllers.Front Count = query[i].Count, Province = query[i].Province, Score = query[i].Score, - SumCount =i==0 ? query[i].SumCount: query[i].SumCount - query[i - 1].SumCount, + SumCount = i == 0 ? query[i].SumCount : query[i].SumCount - query[i - 1].SumCount, Type = query[i].Type, ScoreRegion = i == 0 ? "1~" + query[i].SumCount : query[i - 1].SumCount + 1 + "~ " + query[i].SumCount, Years = query[i].Years, @@ -445,6 +445,12 @@ namespace New_College.Api.Controllers.Front [HttpGet] public async Task>> GetPcUniversityRank([FromQuery] UniversityRankQuery query) { + + if (string.IsNullOrWhiteSpace(query.Year)) + { + query.Year = "2023"; + } + var result = await iD_LongIdMapServices.GetPcUniversityRank(query); return new MessageModel>() { diff --git a/New_College.Model/Models/D_UniversityRank.cs b/New_College.Model/Models/D_UniversityRank.cs index e32a9c5..ddedc8e 100644 --- a/New_College.Model/Models/D_UniversityRank.cs +++ b/New_College.Model/Models/D_UniversityRank.cs @@ -29,5 +29,13 @@ namespace New_College.Model.Models /// [SugarColumn(IsNullable = true)] public int Rank { get; set; } + + /// + /// 分数(没有就是--) + /// + public string Score { get; set; } + + + } } diff --git a/New_College.Model/ViewModels/Query/UniversityQuery.cs b/New_College.Model/ViewModels/Query/UniversityQuery.cs index a022512..7816272 100644 --- a/New_College.Model/ViewModels/Query/UniversityQuery.cs +++ b/New_College.Model/ViewModels/Query/UniversityQuery.cs @@ -59,6 +59,9 @@ namespace New_College.Model.ViewModels /// public string Name { get; set; } + + public string Year { get; set; } + /// /// 院校类别 /// diff --git a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs index e5275ec..9ee40c8 100644 --- a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs +++ b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs @@ -67,7 +67,7 @@ namespace New_College.Repository Web = c.Web, UniversityType = c.SchoolType, SubjectLevel = c.EducationCategory, - Rank = string.IsNullOrEmpty(c.Rank) ? "9999" : c.Rank + Rank = string.IsNullOrEmpty(c.Rank) ? "--" : c.Rank }) .OrderBy(k => k.UId, OrderByType.Asc) .ToPageListAsync(request.PageIndex, request.PageSize, totalCount); diff --git a/New_College.Repository/BASE/D_UniversityRankRepository.cs b/New_College.Repository/BASE/D_UniversityRankRepository.cs index c38498a..43b9bd0 100644 --- a/New_College.Repository/BASE/D_UniversityRankRepository.cs +++ b/New_College.Repository/BASE/D_UniversityRankRepository.cs @@ -6,6 +6,7 @@ using New_College.Model.ViewModels; using New_College.Repository.Base; using NPOI.SS.Formula.Functions; using SqlSugar; +using StackExchange.Profiling.Internal; using System.Collections.Generic; using System.Threading.Tasks; @@ -27,6 +28,7 @@ namespace New_College.Repository .Where((rank, u) => rank.UniversityType == query.Type) .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(query.Name, rank.UniversityName)) .WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType) + .WhereIF(!string.IsNullOrWhiteSpace(query.Year), (rank, u) => rank.Year == query.Year) .OrderBy((rank, u) => rank.Rank, OrderByType.Asc) .Select((rank, u) => new UniversityPcRankList { diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 2d0fc37..fa93414 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -860,6 +860,9 @@ namespace New_College.Services /// public async Task> GetPcUniversityRank(UniversityRankQuery query) { + + + return await d_UniversityRankRepository.GetPcUniversityRank(query); } diff --git a/New_College.Services/D_PlanMajorDescProServices.cs b/New_College.Services/D_PlanMajorDescProServices.cs index 4d5b686..1402fc7 100644 --- a/New_College.Services/D_PlanMajorDescProServices.cs +++ b/New_College.Services/D_PlanMajorDescProServices.cs @@ -62,7 +62,7 @@ namespace New_College.Services SubjectClam = c.SelectSubject, Years = c.Years, OldYears = c.Years - 1, - AcademicYear=c.AcademicYear + AcademicYear = c.AcademicYear }).ToList(); return majorview; } diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index c611a9d..1c62364 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -99,7 +99,7 @@ namespace New_College.Services var responselist = query.data.Select(c => new AIGOResponse() { AreaName = c.AreaName, - Rank = c.Rank.ToString(), + Rank =c.Rank>9999?"--":c.Rank.ToString(), _985 = c._985, _211 = c._211, _SYL = c._SYL,