diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 8b95b88..fb7ad5f 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -109,6 +109,11 @@ namespace New_College.Api.Controllers.Front } var planmajordesc = await _planMajorDescServices.Query(c => SqlFunc.ContainsArray(PlanMajorIds, c.Id));// + var location = planmajordesc.FirstOrDefault().Location; + var majorlist = planmajordesc.Select(c => c.Major).ToList(); + var universityname = planmajordesc.Select(c => c.UniversityName).ToList(); + var planmajorcomplist = await _planMajorDescServices.Query(c => c.Location == location && SqlFunc.ContainsArray(majorlist, c.Major) && SqlFunc.ContainsArray(universityname, c.UniversityName));// + view.VolunteerTableName = query.VolunteerTableName; view.SubjectClaim = query.SubjectClaim; view.CustomerId = query.CustomerId; @@ -132,7 +137,13 @@ namespace New_College.Api.Controllers.Front planCount = s.PlanCount, PlanId = s.Id, SubjectClam = s.SelectSubject, - // PlanItems= s.PlanItems + PlanItems = planmajorcomplist.Select(p => new PlanItem() + { + PlanCount = p.PlanCount, + RankLine = p.LowScoreRank, + Scoreline = p.LowScore, + Year = p.Years.ToString(), + }).ToList() }).ToList() }).ToList();