diff --git a/New_College.Api/Controllers/Front/NewsInfoController.cs b/New_College.Api/Controllers/Front/NewsInfoController.cs index 7a55bac..c981336 100644 --- a/New_College.Api/Controllers/Front/NewsInfoController.cs +++ b/New_College.Api/Controllers/Front/NewsInfoController.cs @@ -65,7 +65,8 @@ namespace New_College.Api.Controllers.Front CoverImg = s.CoverImg, CreateTime = s.CreateTime.Value, Id = s.Id, - Title = s.Title + Title = s.Title, + Summary = s.Summary, }).ToList(); return new MessageModel>() { @@ -105,6 +106,7 @@ namespace New_College.Api.Controllers.Front CoverImg = s.CoverImg, CreateTime = s.CreateTime.Value, Id = s.Id, + Summary = !string.IsNullOrWhiteSpace(s.Summary)?s.Summary:s.Detail.Substring(0,200)+"...", Title = s.Title }).ToList(); } diff --git a/New_College.Model/ViewModels/Result/NewsInfoResponse.cs b/New_College.Model/ViewModels/Result/NewsInfoResponse.cs index 7f3fd98..3817c02 100644 --- a/New_College.Model/ViewModels/Result/NewsInfoResponse.cs +++ b/New_College.Model/ViewModels/Result/NewsInfoResponse.cs @@ -21,6 +21,7 @@ namespace New_College.Model.ViewModels public string CoverImg { get; set; } + public string Summary { get; set; } public DateTime CreateTime { get; set; } } diff --git a/New_College.Model/ViewModels/Result/UniversityResult.cs b/New_College.Model/ViewModels/Result/UniversityResult.cs index b1ecd1d..1d9bc47 100644 --- a/New_College.Model/ViewModels/Result/UniversityResult.cs +++ b/New_College.Model/ViewModels/Result/UniversityResult.cs @@ -219,6 +219,8 @@ namespace New_College.Model.ViewModels public class UniversityPcRankList { + + public int Uid { get; set; } /// /// 院校名称 /// diff --git a/New_College.Repository/BASE/D_UniversityRankRepository.cs b/New_College.Repository/BASE/D_UniversityRankRepository.cs index afb1bc9..c38498a 100644 --- a/New_College.Repository/BASE/D_UniversityRankRepository.cs +++ b/New_College.Repository/BASE/D_UniversityRankRepository.cs @@ -25,7 +25,7 @@ namespace New_College.Repository var response = await this.Db.Queryable((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name }) .Where((rank, u) => rank.UniversityType == query.Type) - .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(query.Name,rank.UniversityName)) + .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(query.Name, rank.UniversityName)) .WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType) .OrderBy((rank, u) => rank.Rank, OrderByType.Asc) .Select((rank, u) => new UniversityPcRankList @@ -38,6 +38,7 @@ namespace New_College.Repository Sff = u.Sff == 1 ? true : false, Sort = rank.Rank, SubjectLevel = u.Subject_Level, + Uid = u.Id }).ToListAsync(); return response; }