feat:rank增加Uid
parent
77e97d37a6
commit
ebbc73074d
|
|
@ -65,7 +65,8 @@ namespace New_College.Api.Controllers.Front
|
||||||
CoverImg = s.CoverImg,
|
CoverImg = s.CoverImg,
|
||||||
CreateTime = s.CreateTime.Value,
|
CreateTime = s.CreateTime.Value,
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
Title = s.Title
|
Title = s.Title,
|
||||||
|
Summary = s.Summary,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
return new MessageModel<List<NewsInfoResponse>>()
|
return new MessageModel<List<NewsInfoResponse>>()
|
||||||
{
|
{
|
||||||
|
|
@ -105,6 +106,7 @@ namespace New_College.Api.Controllers.Front
|
||||||
CoverImg = s.CoverImg,
|
CoverImg = s.CoverImg,
|
||||||
CreateTime = s.CreateTime.Value,
|
CreateTime = s.CreateTime.Value,
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
|
Summary = !string.IsNullOrWhiteSpace(s.Summary)?s.Summary:s.Detail.Substring(0,200)+"...",
|
||||||
Title = s.Title
|
Title = s.Title
|
||||||
}).ToList();
|
}).ToList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ namespace New_College.Model.ViewModels
|
||||||
|
|
||||||
public string CoverImg { get; set; }
|
public string CoverImg { get; set; }
|
||||||
|
|
||||||
|
public string Summary { get; set; }
|
||||||
public DateTime CreateTime { get; set; }
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -219,6 +219,8 @@ namespace New_College.Model.ViewModels
|
||||||
|
|
||||||
public class UniversityPcRankList
|
public class UniversityPcRankList
|
||||||
{
|
{
|
||||||
|
|
||||||
|
public int Uid { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 院校名称
|
/// 院校名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ namespace New_College.Repository
|
||||||
|
|
||||||
var response = await this.Db.Queryable<D_UniversityRank, D_University>((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name })
|
var response = await this.Db.Queryable<D_UniversityRank, D_University>((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name })
|
||||||
.Where((rank, u) => rank.UniversityType == query.Type)
|
.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)
|
.WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType)
|
||||||
.OrderBy((rank, u) => rank.Rank, OrderByType.Asc)
|
.OrderBy((rank, u) => rank.Rank, OrderByType.Asc)
|
||||||
.Select((rank, u) => new UniversityPcRankList
|
.Select((rank, u) => new UniversityPcRankList
|
||||||
|
|
@ -38,6 +38,7 @@ namespace New_College.Repository
|
||||||
Sff = u.Sff == 1 ? true : false,
|
Sff = u.Sff == 1 ? true : false,
|
||||||
Sort = rank.Rank,
|
Sort = rank.Rank,
|
||||||
SubjectLevel = u.Subject_Level,
|
SubjectLevel = u.Subject_Level,
|
||||||
|
Uid = u.Id
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue