From 1d6cc74cb915cb1625a0dee76712b49c7e27fd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Mon, 25 Dec 2023 12:03:39 +0800
Subject: [PATCH] bug fixed

---
 New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs | 2 +-
 New_College.Services/D_PlanMajorDescServices.cs          | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
index 361b243..84e8144 100644
--- a/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
+++ b/New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs
@@ -241,7 +241,7 @@ namespace New_College.Model.ViewModels
     public class OneSubmitGoResponse
     {
 
-
+        public string AcademicYear { get; set; }
         public int LowScore { get; set; }
         public int LowScoreRank { get; set; }
         /// <summary>
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index 2a6bbc9..fd70c64 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -248,12 +248,13 @@ namespace New_College.Services
                 // AcademicYear = c.Years.ToString()
 
             }).ToList();
-            var responselist = query.data.Select(c => new OneSubmitGoResponse()
+            var responselist = query.data.OrderByDescending(c => c.SelectSubject).Select(c => new OneSubmitGoResponse()
             {
                 AreaName = c.AreaName,
                 fee = c.Free,
                 Major = c.Major,
                 MajorGroup = c.MajorGroup,
+                AcademicYear = c.AcademicYear,
                 MajorRemark = c.Remark,
                 planCount = c.PlanCount,
                 Ownership = c.Ownership,
@@ -282,9 +283,9 @@ namespace New_College.Services
                 }).OrderByDescending(k => k.Year).ToList()
             }).ToList();
             //冲稳保比例--待定
-            var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.LowScore).Take(18).ToList();
-            newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.LowScore).Take(60).ToList());
-            newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.LowScore).Take(18).ToList());
+            var newlist = responselist.Where(c => c.Type == 2).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(18).ToList();
+            newlist.AddRange(responselist.Where(c => c.Type == 1).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(60).ToList());
+            newlist.AddRange(responselist.Where(c => c.Type == 0).OrderByDescending(c => c.SubjectClam).OrderByDescending(c => c.LowScore).Take(18).ToList());
 
             return new PageModel<OneSubmitGoResponse>()
             {