From 0f6b33467cc14a805bc8459a9cb6d4c21b1691b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E5=A4=A7=E5=B8=88?= <156663459@qq.com> Date: Wed, 7 Jul 2021 16:50:08 +0800 Subject: [PATCH] ---fix bug--- --- .../T_EnrollmentPlanedescServices.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/New_College.Services/T_EnrollmentPlanedescServices.cs b/New_College.Services/T_EnrollmentPlanedescServices.cs index 589140f..3dee2be 100644 --- a/New_College.Services/T_EnrollmentPlanedescServices.cs +++ b/New_College.Services/T_EnrollmentPlanedescServices.cs @@ -26,7 +26,7 @@ namespace New_College.Services private readonly ID_MajorRepository d_MajorRepository; private readonly ID_MajorClassRepository d_MajorClassRepository; private readonly ID_MajorCategoryRepository d_MajorCategoryRepository; - + private readonly IT_PlanMapTagRepository t_PlanMapTagRepository; private readonly IT_RegionScoreRepository t_RegionScoreRepository; private readonly IU_ProbabilityHistoryRepository u_ProbabilityHistoryRepository; @@ -956,7 +956,7 @@ namespace New_College.Services var batchids = batchinfo.Select(s => s.Id).ToList(); //通过条件筛选出所有的 var wheres = PredicateBuilder.New(); - wheres.And(x => x.Scoreline <= query.Score && x.Scoreline > 0 && majornames.Contains(x.MajorName) && universityids.Contains(x.UniversityId) && x.PlanId == planinfo.FirstOrDefault().Id && batchids.Contains(x.BatchtypeId)); + wheres.And(x => x.Scoreline <= ( query.Score + 10) && x.Scoreline > 0 && majornames.Contains(x.MajorName) && universityids.Contains(x.UniversityId) && x.PlanId == planinfo.FirstOrDefault().Id && batchids.Contains(x.BatchtypeId)); //根据上述所有筛选 求出招生计划 var plandesc = await _dal.Query(wheres, "Scoreline desc"); if (plandesc.Count <= 0) @@ -1227,7 +1227,7 @@ namespace New_College.Services public async Task>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) { - // return await this.t_EnrollmentPlanedesc.GetCWBUniversityDetail(query); + // return await this.t_EnrollmentPlanedesc.GetCWBUniversityDetail(query); 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 = "所选省份年份的招生计划，正在完善中..." }; @@ -1750,11 +1750,11 @@ namespace New_College.Services if (!string.IsNullOrWhiteSpace(item.PlanMajorIds)) { var planids = item.PlanMajorIds.Split(",").Select(x => int.Parse(x)).ToList(); - var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList(); - if (nowdesc.Count <= 0) - continue; - //此处处理针对于霍兰德推荐的具有相同学校的案例 - var count = list.Where(x => x.UniversityName == item.UniversityName).ToList(); + var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList(); + if (nowdesc.Count <= 0) + continue; + //此处处理针对于霍兰德推荐的具有相同学校的案例 + var count = list.Where(x => x.UniversityName == item.UniversityName).ToList(); if (count.Count > 0) { var newinfos = nowdesc.Select(x => new PlanInfo()