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

---bug --fix-

develop
易大师 2021-07-03 23:40:28 +08:00
parent 21cb31bb41
commit a097d19090
1 changed files with 82 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -1737,12 +1737,17 @@ namespace New_College.Services
var planstringids = info.Select(x => x.PlanMajorIds).ToList(); var planstringids = info.Select(x => x.PlanMajorIds).ToList();
List<int> PlanIds = new List<int>() { }; List<int> PlanIds = new List<int>() { };
foreach (var item in planstringids) foreach (var item in planstringids)
{
if (!string.IsNullOrWhiteSpace(item))
{ {
var newids = item.Split(",").Select(x => int.Parse(x)).ToList(); var newids = item.Split(",").Select(x => int.Parse(x)).ToList();
PlanIds.AddRange(newids); PlanIds.AddRange(newids);
} }
}
var descinfo = await _dal.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id)); var descinfo = await _dal.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id));
foreach (var item in info) foreach (var item in info)
{
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();
@ -1761,6 +1766,7 @@ namespace New_College.Services
Scoreline = x.Scoreline Scoreline = x.Scoreline
}).ToList(); }).ToList();
count.FirstOrDefault().Infos.AddRange(newinfos); count.FirstOrDefault().Infos.AddRange(newinfos);
} }
else else
{ {
@ -1784,6 +1790,7 @@ namespace New_College.Services
}).ToList() }).ToList()
}); });
} }
}
} }
return new MessageModel<List<VolunteerTableResult>>() { success = true, msg = "获取成功", response = list }; return new MessageModel<List<VolunteerTableResult>>() { success = true, msg = "获取成功", response = list };
@ -1871,10 +1878,12 @@ namespace New_College.Services
var id = 0; var id = 0;
foreach (var item in query.details) foreach (var item in query.details)
{ {
if (item.PlanMagorIds != null && item.PlanMagorIds.Count() > 0)
{
PlanIds.AddRange(item.PlanMagorIds); PlanIds.AddRange(item.PlanMagorIds);
id = item.PlanMagorIds.First(); id = item.PlanMagorIds.First();
} }
}
string yearName = string.Empty; string yearName = string.Empty;
var plandescmodels = await this.t_EnrollmentPlanedesc.QueryById(id); var plandescmodels = await this.t_EnrollmentPlanedesc.QueryById(id);
if (plandescmodels != null) if (plandescmodels != null)
@ -1888,6 +1897,9 @@ namespace New_College.Services
var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc"); var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc");
foreach (var item in query.details) foreach (var item in query.details)
{ {
if (item.PlanMagorIds != null && item.PlanMagorIds.Count() > 0)
{
var nowdesc = descinfo.Where(x => item.PlanMagorIds.Contains(x.Id)).ToList(); var nowdesc = descinfo.Where(x => item.PlanMagorIds.Contains(x.Id)).ToList();
if (nowdesc.Count <= 0) if (nowdesc.Count <= 0)
continue; continue;
@ -1935,6 +1947,7 @@ namespace New_College.Services
}); });
} }
} }
}
return new MessageModel<List<SimuVolunteerTableResult>>() { success = true, msg = "获取成功", response = list }; return new MessageModel<List<SimuVolunteerTableResult>>() { success = true, msg = "获取成功", response = list };
} }