From b36343c2d185effeee8b52280d8b2297e130975d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Fri, 21 Jun 2024 13:46:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BE=85=E6=9C=80=E6=96=B0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=87=BA=E6=9D=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Front/EnrollMentPlansController.cs | 2 +- .../BASE/D_PlanMajorDescProRepository.cs | 2 +- .../BASE/T_EnrollmentPlanedescRepository.cs | 6 +++--- New_College.Services/D_PlanMajorDescProServices.cs | 2 +- New_College.Services/D_PlanMajorDescServices.cs | 4 ++-- .../T_EnrollmentPlanedescServices.cs | 12 ++++++------ New_College.Services/V_CustomerInfoServices.cs | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/New_College.Api/Controllers/Front/EnrollMentPlansController.cs b/New_College.Api/Controllers/Front/EnrollMentPlansController.cs index ccf5f42..f1a2833 100644 --- a/New_College.Api/Controllers/Front/EnrollMentPlansController.cs +++ b/New_College.Api/Controllers/Front/EnrollMentPlansController.cs @@ -43,7 +43,7 @@ namespace New_College.Api.Controllers.Front { try { - request.Years = request.Years >= 2023 ? 2023 : request.Years; + request.Years = request.Years > 2024 ? 2024 : request.Years; Expression> whereexp = Expressionable.Create() //创建表达式 .And(c => c.Location == request.Location) .And(c => c.Years == request.Years) diff --git a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs index 0a98c20..7f01a1f 100644 --- a/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs +++ b/New_College.Repository/BASE/D_PlanMajorDescProRepository.cs @@ -43,7 +43,7 @@ namespace New_College.Repository { RefAsync totalCount = 0; var pageresult = new PageModel(); - request.Year = request.Year > DateTime.Now.Year - 1 ? DateTime.Now.Year - 1 : request.Year; + request.Year = request.Year > 2024 ? 2024 : request.Year; var pagelist = await this.Db.Queryable().Where(c => c.Location == request.Location) .Where(c => c.Years == request.Year) .WhereIF(request.Sff.HasValue, c => c._211 == (request.Sff == 1 ? "是" : "否")) diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index 0a02f57..668bd18 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -59,7 +59,7 @@ namespace New_College.Repository public async Task>> GetUniversityMapItems(CWBUniversityDetailQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : 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(); @@ -151,7 +151,7 @@ namespace New_College.Repository /// public async Task>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : query.Year; RefAsync totalNumber = 0; if (query.provinceIds == null) { @@ -345,7 +345,7 @@ namespace New_College.Repository RefAsync totalNumber = 0; var maxscore = query.Score + 15; var minscore = query.Score - 60; - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : 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; //} diff --git a/New_College.Services/D_PlanMajorDescProServices.cs b/New_College.Services/D_PlanMajorDescProServices.cs index ed1b9ba..4ab4ace 100644 --- a/New_College.Services/D_PlanMajorDescProServices.cs +++ b/New_College.Services/D_PlanMajorDescProServices.cs @@ -38,7 +38,7 @@ namespace New_College.Services /// public async Task GetMajorPlanPro(MajorPlanProViewQuery request) { - request.Year = request.Year > (DateTime.Now.Year - 1) ? (DateTime.Now.Year - 1) : request.Year; + request.Year = request.Year > 2024 ? 2024 : request.Year; var majorview = new MajorPlanProView(); Expression> expression = Expressionable.Create() .And(c => c.UId == request.UId) diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index fe49b9a..6753fba 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -178,7 +178,7 @@ namespace New_College.Services var pagemodel = new AIGOPageModel(); int startscore = request.Score - 60; int endscore = request.Score + 15; - int qyear = request.Year >= 2023 ? 2023 : request.Year; + int qyear = request.Year > 2024 ? 2024 : request.Year; string batchtypeName = request.SubjectClaim.Length > 2 ? "综合" : request.SubjectClaim; request.SubjectClaim = request.SubjectClaim.Length == 2 ? (request.SubjectClaim == "理科" ? "物,化,生" : "政,史,地") : request.SubjectClaim; @@ -361,7 +361,7 @@ namespace New_College.Services } //request.PageSize = 150;//山东省 - request.Year = request.Year > 2023 ? 2023 : request.Year; + request.Year = request.Year > 2024 ? 2024 : request.Year; // var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); Expression> expression3 = Expressionable.Create() .And(c => c.Location == request.Location) diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 80f801f..db3e8a7 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -415,7 +415,7 @@ namespace New_College.Services /// public async Task>> GetEnrollmentLazyByPage(LazyEnrollmentPlaneQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : 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); @@ -886,7 +886,7 @@ namespace New_College.Services /// public async Task> GetUniversityProbability(UniversityProbabilityQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : query.Year; var universityinfoline = await _QualificationLineRepository.Query(c => c.UId == query.UniversityId); if (universityinfoline == null) return new MessageModel() { success = false, msg = "院校信息不存在" }; @@ -1208,7 +1208,7 @@ namespace New_College.Services /// public async Task>> GetAutoVolunteerTableDetail(VolunteerTableQuery query) { - string yearName = "2023"; + string yearName = "2024"; if (query.details == null) return new MessageModel>() { success = false, msg = "选择专业院校为空..." }; List list = new List() { }; @@ -1297,7 +1297,7 @@ namespace New_College.Services /// public async Task>> GetHollandVolunteerTableDetail(HollandVolunteerTableQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : 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 = "传入年份省份有误" }; @@ -1377,7 +1377,7 @@ namespace New_College.Services /// public async Task> GetSubjectSelectByTag(ByTagSubjectSelectQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : 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 = "所选省份年份的招生计划，正在完善中..." }; @@ -1463,7 +1463,7 @@ namespace New_College.Services /// public async Task>> GetMajorPlanClaim(CustomerQuery query) { - query.Year = query.Year > 2023 ? 2023 : query.Year; + query.Year = query.Year > 2024 ? 2024 : query.Year; //查招生计划 var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId); if (planinfo == null) diff --git a/New_College.Services/V_CustomerInfoServices.cs b/New_College.Services/V_CustomerInfoServices.cs index 8d8f3c0..4b83bb5 100644 --- a/New_College.Services/V_CustomerInfoServices.cs +++ b/New_College.Services/V_CustomerInfoServices.cs @@ -356,7 +356,7 @@ namespace New_College.Services var info = await _dal.QueryById(query.Id); if (info == null || info.IsDelete) return new MessageModel() { success = false, msg = "获取失败，用户信息为空" }; - var years = info.Year > 2023 ? 2023 : info.Year; + var years = info.Year; string typename = "综合"; if (info.subjectgroupName != null)