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

---fix bug---

develop
易大师 2021-07-07 16:50:08 +08:00
parent 0382afd44f
commit 0f6b33467c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -26,7 +26,7 @@ namespace New_College.Services
private readonly ID_MajorRepository d_MajorRepository; private readonly ID_MajorRepository d_MajorRepository;
private readonly ID_MajorClassRepository d_MajorClassRepository; private readonly ID_MajorClassRepository d_MajorClassRepository;
private readonly ID_MajorCategoryRepository d_MajorCategoryRepository; private readonly ID_MajorCategoryRepository d_MajorCategoryRepository;
private readonly IT_PlanMapTagRepository t_PlanMapTagRepository; private readonly IT_PlanMapTagRepository t_PlanMapTagRepository;
private readonly IT_RegionScoreRepository t_RegionScoreRepository; private readonly IT_RegionScoreRepository t_RegionScoreRepository;
private readonly IU_ProbabilityHistoryRepository u_ProbabilityHistoryRepository; private readonly IU_ProbabilityHistoryRepository u_ProbabilityHistoryRepository;
@ -956,7 +956,7 @@ namespace New_College.Services
var batchids = batchinfo.Select(s => s.Id).ToList(); var batchids = batchinfo.Select(s => s.Id).ToList();
//通过条件筛选出所有的 //通过条件筛选出所有的
var wheres = PredicateBuilder.New<T_EnrollmentPlanedesc>(); var wheres = PredicateBuilder.New<T_EnrollmentPlanedesc>();
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"); var plandesc = await _dal.Query(wheres, "Scoreline desc");
if (plandesc.Count <= 0) if (plandesc.Count <= 0)
@ -1227,7 +1227,7 @@ namespace New_College.Services
public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> GetCWBUniversityDetail(CWBUniversityDetailQuery query) public async Task<MessageModel<PageModel<UniversityEnrollmentPlanResult>>> 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); var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Years == query.Year && w.Area_Id == query.AreaId);
if (planinfo == null) if (planinfo == null)
return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." }; return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." };
@ -1750,11 +1750,11 @@ namespace New_College.Services
if (!string.IsNullOrWhiteSpace(item.PlanMajorIds)) if (!string.IsNullOrWhiteSpace(item.PlanMajorIds))
{ {
var planids = item.PlanMajorIds.Split(",").Select(x => int.Parse(x)).ToList(); var planids = item.PlanMajorIds.Split(",").Select(x => int.Parse(x)).ToList();
var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList(); var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList();
if (nowdesc.Count <= 0) if (nowdesc.Count <= 0)
continue; continue;
//此处处理针对于霍兰德推荐的具有相同学校的案例 //此处处理针对于霍兰德推荐的具有相同学校的案例
var count = list.Where(x => x.UniversityName == item.UniversityName).ToList(); var count = list.Where(x => x.UniversityName == item.UniversityName).ToList();
if (count.Count > 0) if (count.Count > 0)
{ {
var newinfos = nowdesc.Select(x => new PlanInfo() var newinfos = nowdesc.Select(x => new PlanInfo()