diff --git a/New_College.Api/Controllers/Front/LibraryController.cs b/New_College.Api/Controllers/Front/LibraryController.cs index 092c8e1..9512973 100644 --- a/New_College.Api/Controllers/Front/LibraryController.cs +++ b/New_College.Api/Controllers/Front/LibraryController.cs @@ -462,6 +462,10 @@ namespace New_College.Api.Controllers.Front [HttpGet] public async Task>> GetUniversityRank([FromQuery] UniversityRankQuery query) { + if (string.IsNullOrWhiteSpace(query.Year)) + { + query.Year = query.Type == 3 ? "2024" : "2023"; + } var result = await iD_LongIdMapServices.GetUniversityRank(query); return new MessageModel>() { @@ -484,6 +488,7 @@ namespace New_College.Api.Controllers.Front if (string.IsNullOrWhiteSpace(query.Year)) { query.Year = query.Type==3?"2024":"2023"; + // query.SubjectType = query.Type; } var result = await iD_LongIdMapServices.GetPcUniversityRank(query); diff --git a/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs b/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs index 138e20e..72a75df 100644 --- a/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs +++ b/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs @@ -58,13 +58,13 @@ namespace New_College.Api.Controllers var list = new List(); if (month < 8)//大于8月份则高考时间已过,为往届高考生 { - list.Add(new LizationDto() - { - name = (nowyear - 1).ToString(), - code = nowyear - 1, - Policy = nowyear - 1 < a.Years ? 0 : a.Policy + //list.Add(new LizationDto() + //{ + // name = (nowyear - 1).ToString(), + // code = nowyear - 1, + // Policy = nowyear - 1 < a.Years ? 0 : a.Policy - }); + //}); list.Add(new LizationDto() { name = nowyear.ToString() + "(现高三)", diff --git a/New_College.Api/Startup.cs b/New_College.Api/Startup.cs index e785ed9..7e07d59 100644 --- a/New_College.Api/Startup.cs +++ b/New_College.Api/Startup.cs @@ -146,19 +146,6 @@ namespace New_College options.JsonSerializerOptions.AllowTrailingCommas = true; //反序列化过程中属性名称是否使用不区分大小写的比较 // options.JsonSerializerOptions.PropertyNameCaseInsensitive = false; - - ////忽略循环引用 - //options.JsonSerializerOptions.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - ////不使用驼峰样式的key - //options.SerializerSettings.ContractResolver = new DefaultContractResolver(); - ////设置时间格式 - //options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; - ////忽略Model中为null的属性 - ////options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore; - ////设置本地时间而非UTC时间 - //options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local; - ////添加Enum转string - //options.SerializerSettings.Converters.Add(new StringEnumConverter()); ////将long类型转为string //options.SerializerSettings.Converters.Add(new NumberConverter(NumberConverterShip.Int64)); }); diff --git a/New_College.Repository/BASE/D_UniversityRankRepository.cs b/New_College.Repository/BASE/D_UniversityRankRepository.cs index 2c5c7e1..5fc688f 100644 --- a/New_College.Repository/BASE/D_UniversityRankRepository.cs +++ b/New_College.Repository/BASE/D_UniversityRankRepository.cs @@ -23,7 +23,7 @@ namespace New_College.Repository public async Task> GetPcUniversityRank(UniversityRankQuery query) { - var response = await this.Db.Queryable((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name }) + var response = await this.Db.Queryable((rank, u) => new object[] { JoinType.Inner, rank.UniversityName == u.Name }) .Where((rank, u) => rank.UniversityType == query.Type) .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(rank.UniversityName, query.Name)) .WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType) diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 27a0c28..e2a6f5c 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -896,7 +896,7 @@ namespace New_College.Services /// public async Task> GetUniversityRank(UniversityRankQuery query) { - var info = await d_UniversityRankRepository.Query(x => x.IsDelete == false && x.UniversityType == query.Type && x.Year == "2023"); + var info = await d_UniversityRankRepository.Query(x => x.IsDelete == false && x.UniversityType == query.Type && x.Year == query.Year); if (info.Count <= 0) return new List() { }; List list = new List() { }; diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs index 6ee314e..c304669 100644 --- a/New_College.Services/V_CustomerInfoServices.cs +++ b/New_College.Services/V_CustomerInfoServices.cs @@ -44,7 +44,7 @@ namespace New_College.Services { try { - DingHookHelper.DingTalkHookMessage("UpdateCasdoorPwd", JsonConvert.SerializeObject(query)); + // DingHookHelper.DingTalkHookMessage("UpdateCasdoorPwd", JsonConvert.SerializeObject(query)); var list = await _casdoorUserRepository.Query(e => e.id == query.openId); if (list != null && list.Count() > 0) {