From e610f17d7b5aa0f0e9137efec9a402034e585d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 21 Nov 2023 11:57:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E6=88=91=E7=9A=84=E5=BF=97=E6=84=BF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Front/PcVolunteerController.cs      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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();