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

bug fixed seach university

develop
old易 2023-11-16 15:38:08 +08:00
parent 094f15fc44
commit d70750aabb
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
New_College.Api/appsettings.json
View File

@ -26,7 +26,7 @@
"Name": "New_College" "Name": "New_College"
} }
}, },
"urls": "http://*:8083", // IIS 部署，注释掉 "urls": "http://*:8082", // IIS 部署，注释掉
"AllowedHosts": "*", "AllowedHosts": "*",
"AppSettings": { "AppSettings": {
"RedisCachingAOP": { "RedisCachingAOP": {

8
New_College.Model/ViewModels/Query/UniversityQuery.cs
View File

@ -12,7 +12,7 @@ namespace New_College.Model.ViewModels
/// <summary> /// <summary>
/// 学科层次 /// 学科层次
/// </summary> /// </summary>
public int SubjectLevel { get; set; } public int? SubjectLevel { get; set; }
/// <summary> /// <summary>
/// 省市区名称 /// 省市区名称
/// </summary> /// </summary>
@ -34,17 +34,17 @@ namespace New_College.Model.ViewModels
/// <summary> /// <summary>
/// 是否985 0、否，1、是 /// 是否985 0、否，1、是
/// </summary> /// </summary>
public int Nhef { get; set; } = -1; public int? Nhef { get; set; }
/// <summary> /// <summary>
/// 是否211 0、否，1、是 /// 是否211 0、否，1、是
/// </summary> /// </summary>
public int Sff { get; set; } = -1; public int? Sff { get; set; }
/// <summary> /// <summary>
/// 是否双一流 0、否，1、是 /// 是否双一流 0、否，1、是
/// </summary> /// </summary>
public int Syl { get; set; } = -1; public int? Syl { get; set; }
} }
public class UniversityRankQuery public class UniversityRankQuery

16
New_College.Services/D_LongIdMapServices.cs
View File

@ -113,14 +113,14 @@ namespace New_College.Services
{ {
Expression<Func<D_University, bool>> expression = Expressionable.Create<D_University>() Expression<Func<D_University, bool>> expression = Expressionable.Create<D_University>()
.And(x => x.IsDelete == false) .And(x => x.IsDelete == false)
.AndIF(query.AreaName.Any() && !query.AreaName.Contains("全国"), x => SqlFunc.ContainsArray(query.AreaName, x.Area_Name)) .AndIF(query.AreaName!=null&& query.AreaName.Any() && !query.AreaName.Contains("全国"), x => SqlFunc.ContainsArray(query.AreaName, x.Area_Name))
.AndIF(query.Nature.Any(), x => SqlFunc.ContainsArray(query.Nature, x.Nature)) .AndIF(query.Nature != null && query.Nature.Any(), x => SqlFunc.ContainsArray(query.Nature, x.Nature))
.AndIF(query.Type.Any(), x => SqlFunc.ContainsArray(query.Type, x.Type)) .AndIF(query.Nature != null && query.Type.Any(), x => SqlFunc.ContainsArray(query.Type, x.Type))
.AndIF(query.SubjectLevel > 0, x => x.Subject_Level == query.SubjectLevel) .AndIF(query.SubjectLevel.HasValue, x => x.Subject_Level == query.SubjectLevel)
.AndIF(query.Nhef > 0, x => x.Nhef == query.Nhef) .AndIF(query.Nhef.HasValue, x => x.Nhef == query.Nhef)
.AndIF(query.Sff > 0, x => x.Sff == query.Sff) .AndIF(query.Sff.HasValue, x => x.Sff == query.Sff)
.AndIF(query.Syl > 0, x => x.Syl == query.Syl) .AndIF(query.Syl.HasValue, x => x.Syl == query.Syl)
.AndIF(!string.IsNullOrWhiteSpace(query.Name), u => SqlFunc.Contains(query.Name, u.Name)) .AndIF(!string.IsNullOrWhiteSpace(query.Name), u => SqlFunc.Contains(query.Name,u.Name))
.ToExpression(); .ToExpression();
var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc"); var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc");