diff --git a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs index bb2fe4f..37b7b08 100644 --- a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs +++ b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs @@ -220,12 +220,12 @@ namespace New_College.Api.Controllers UniversityName = c.UniversityName, Sort = sort, PlanMajorIds = c.PlanId.ToString(), - VolunteerRemark = JsonConvert.SerializeObject(new VolteerItem() + VolunteerRemark = JsonConvert.SerializeObject(new List() { new VolteerItem() { planId = c.PlanId, tage = c.Percentage, type = c.Type, - }) + }}) }); }); vollunterrrequest.volunteerTableDetailViews = vollitem; diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 05b9c2a..3210ba8 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -152,9 +152,9 @@ namespace New_College.Api.Controllers.Front PlanId = c.Id, Sort = s.OrderSort, SubjectClam = c.SelectSubject, - Percentage = typeinfo.Any()&&typeinfo.Count()>0 ? typeinfo.FirstOrDefault(d => d.planId == c.Id).tage : 0, + Percentage = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.Id).tage : 0, Type = typeinfo.Any() && typeinfo.Count() > 0 ? typeinfo.FirstOrDefault(d => d.planId == c.Id).type : 0, - PlanItems = planmajorcomplist.Where(ee => ee.UId == s.UniversityId && ee.Major == c.Major).Select(tt => new PlanItem() + PlanItems = planmajorcomplist.Where(ee => ee.UId == s.UniversityId && ee.Major == c.Major && ee.MajorCode == c.MajorCode).Select(tt => new PlanItem() { Count = (tt.PlanCount == 0 ? "--" : tt.PlanCount.ToString()), PlanCount = tt.PlanCount,