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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
View File

@ -220,12 +220,12 @@ namespace New_College.Api.Controllers
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
Sort = sort, Sort = sort,
PlanMajorIds = c.PlanId.ToString(), PlanMajorIds = c.PlanId.ToString(),
VolunteerRemark = JsonConvert.SerializeObject(new VolteerItem() VolunteerRemark = JsonConvert.SerializeObject(new List<VolteerItem>() { new VolteerItem()
{ {
planId = c.PlanId, planId = c.PlanId,
tage = c.Percentage, tage = c.Percentage,
type = c.Type, type = c.Type,
}) }})
}); });
}); });
vollunterrrequest.volunteerTableDetailViews = vollitem; vollunterrrequest.volunteerTableDetailViews = vollitem;

4
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -152,9 +152,9 @@ namespace New_College.Api.Controllers.Front
PlanId = c.Id, PlanId = c.Id,
Sort = s.OrderSort, Sort = s.OrderSort,
SubjectClam = c.SelectSubject, 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, 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()), Count = (tt.PlanCount == 0 ? "--" : tt.PlanCount.ToString()),
PlanCount = tt.PlanCount, PlanCount = tt.PlanCount,