diff --git a/New_College.Api/Controllers/Front/FackUniversityController.cs b/New_College.Api/Controllers/Front/FackUniversityController.cs index 1d4c3de..c8104d1 100644 --- a/New_College.Api/Controllers/Front/FackUniversityController.cs +++ b/New_College.Api/Controllers/Front/FackUniversityController.cs @@ -20,7 +20,6 @@ namespace New_College.Api.Controllers.Front /// [Route("api/front/[controller]/[action]")] [ApiController] - [Authorize] public class FackUniversityController : ControllerBase { private readonly ID_FackUniversityServices d_FackUniversityServices; diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 3b65090..e0b8067 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -51,6 +51,7 @@ namespace New_College.Repository public async Task>> GetUniversityMapItems(CWBUniversityDetailQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; var response = new List(); RefAsync totalNumber = 0; var regionlist = this.Db.Queryable().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => SqlFunc.ContainsArray(query.provinceIds, c.KeyId)).Select(c => c.RegionName).ToList(); @@ -118,6 +119,7 @@ namespace New_College.Repository /// public async Task>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; RefAsync totalNumber = 0; var regionlist = this.Db.Queryable().Where(c => c.Level == 1).WhereIF(query.provinceIds != null && query.provinceIds.Any(), c => SqlFunc.ContainsArray(query.provinceIds, c.KeyId)).Select(c => c.RegionName).ToList(); @@ -225,6 +227,7 @@ namespace New_College.Repository RefAsync totalNumber = 0; var maxscore = query.Score + 10; var minscore = query.Score - 10; + query.Year = query.Year > 2022 ? 2022 : query.Year; //var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId)); // int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id; @@ -241,7 +244,7 @@ namespace New_College.Repository //} var recommendInfo = await this.Db.Queryable((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id }) .Where((plans, universitys) => plans.Location == query.Location) - .Where((plans, universitys) => plans.Years == query.Year - 1) + .Where((plans, universitys) => plans.Years == query.Year) .WhereIF(query.SubjectLevel > 0, (plans, universitys) => universitys.Subject_Level == query.SubjectLevel) .WhereIF(query.Type >= 0, (plans, universitys) => universitys.Type == query.Type) .WhereIF(query.Nhef >= 0, (plans, universitys) => universitys.Nhef == query.Nhef) diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index b5449ad..8ad715c 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -921,6 +921,7 @@ namespace New_College.Services /// public async Task>> GetEnrollmentLazyByPage(LazyEnrollmentPlaneQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; if (query.Score <= 0) return new MessageModel>() { success = false, msg = "分数不能为0..." }; //var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); @@ -1263,7 +1264,7 @@ namespace New_College.Services /// public async Task>> GetUniversityMapItems(CWBUniversityDetailQuery query) { - return await this.t_EnrollmentPlanedesc.GetUniversityMapItems(query); + return await this.t_EnrollmentPlanedesc.GetUniversityMapItems(query); } /// @@ -1473,6 +1474,7 @@ namespace New_College.Services /// public async Task> GetUniversityProbability(UniversityProbabilityQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; var universityinfo = await d_UniversityRepository.QueryById(query.UniversityId); if (universityinfo == null) return new MessageModel() { success = false, msg = "院校信息不存在" }; @@ -1919,6 +1921,7 @@ namespace New_College.Services /// public async Task>> GetAutoVolunteerTableDetail(VolunteerTableQuery query) { + if (query.details == null) return new MessageModel>() { success = false, msg = "选择专业院校为空..." }; List list = new List() { }; @@ -2007,6 +2010,7 @@ namespace New_College.Services /// public async Task>> GetHollandVolunteerTableDetail(HollandVolunteerTableQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); if (planinfo.Count <= 0) return new MessageModel>() { success = false, msg = "传入年份省份有误" }; @@ -2085,6 +2089,7 @@ namespace New_College.Services /// public async Task> GetSubjectSelectByTag(ByTagSubjectSelectQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); if (planinfo == null) return new MessageModel() { success = false, msg = "所选省份年份的招生计划,正在完善中..." }; @@ -2170,6 +2175,7 @@ namespace New_College.Services /// public async Task>> GetMajorPlanClaim(CustomerQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; //查招生计划 var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); if (planinfo == null) @@ -2250,6 +2256,7 @@ namespace New_College.Services /// public async Task>> GetBatchByYearArea(YearAreaQuery query) { + query.Year = query.Year > 2023 ? 2023 : query.Year; var info = await t_EnrollmentBatchRepository.Query(x => x.IsDelete == false && x.AreaName == query.AreaName && x.Year == query.Year && !x.Batch_name.Contains("提前") && !x.Batch_name.Contains("零志愿")); if (info.Count <= 0) return new MessageModel>() { success = false, msg = "数据为空" };