bug fixed

develop
old易 2023-12-27 14:34:58 +08:00
parent eec661be04
commit 080d3f02eb
2 changed files with 4 additions and 4 deletions

View File

@ -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<VolteerItem>() { new VolteerItem()
{
planId = c.PlanId,
tage = c.Percentage,
type = c.Type,
})
}})
});
});
vollunterrrequest.volunteerTableDetailViews = vollitem;

View File

@ -154,7 +154,7 @@ namespace New_College.Api.Controllers.Front
SubjectClam = c.SelectSubject,
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,