From 5fbda5e2ed69665f44a6b6c340ba5f767d991e56 Mon Sep 17 00:00:00 2001
From: ceruIean <his-orange@outlook.com>
Date: Mon, 22 Nov 2021 22:00:00 +0800
Subject: [PATCH] cleanup

---
 Pages/Message/Index.cshtml.cs  | 2 +-
 Pages/Students/Index.cshtml    | 2 +-
 Pages/Students/Index.cshtml.cs | 2 +-
 Utils/Arranger.cs              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Pages/Message/Index.cshtml.cs b/Pages/Message/Index.cshtml.cs
index 026241f..3d2c4d0 100644
--- a/Pages/Message/Index.cshtml.cs
+++ b/Pages/Message/Index.cshtml.cs
@@ -119,7 +119,7 @@ namespace _2021_backend.Pages.Message
             var stu = Context.Students.ToList();
             foreach (var e in stu)
             {
-                if (e.Status != status.不通过)
+                if (e.Status != status.不通过 && e.Status != status.已选时间)
                 {
                     await Utils.TencentSMS.Send(Context, SMSType.TimeSelect, e, Context.Users.Find(Guid.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value)).Name);
                 }
diff --git a/Pages/Students/Index.cshtml b/Pages/Students/Index.cshtml
index 139225a..ba0ba6b 100644
--- a/Pages/Students/Index.cshtml
+++ b/Pages/Students/Index.cshtml
@@ -34,7 +34,7 @@
         </select>
     </div>
     <button type="submit" class="btn btn-outline-primary m-2">搜索</button>
-    <input type="submit" value="finalize" class="btn btn-primary" asp-page-handler="Finalize" />
+    <input type="submit" value="finalize" class="btn btn-primary" asp-page-handler="Cleanup" />
 </form>
 <table class="table">
     <thead>
diff --git a/Pages/Students/Index.cshtml.cs b/Pages/Students/Index.cshtml.cs
index 6bfd213..352cdf7 100644
--- a/Pages/Students/Index.cshtml.cs
+++ b/Pages/Students/Index.cshtml.cs
@@ -101,7 +101,7 @@ namespace _2021_backend.Pages.Students
             foreach(var s in Context.Students)
             {
                 if (s.RegisterTime.CompareTo(new DateTime(2021, 11, 11)) > 0) s.Status = status.不通过;
-                else if (s.Status == status.不通过) s.Status = status.刚报名;
+                else if (s.Timelist.Count == 0) s.Status = status.需调整时间;
             }
             Context.SaveChanges();
             return Construct((int)pageId, errInfo);
diff --git a/Utils/Arranger.cs b/Utils/Arranger.cs
index 333d310..80bcff9 100644
--- a/Utils/Arranger.cs
+++ b/Utils/Arranger.cs
@@ -16,7 +16,7 @@ namespace _2021_backend.Utils
         public static bool Arrange(BackendContext context)
         {
             Context = context;
-            students = context.Students.Where(it => it.Status != status.不通过 && it.Status != status.已确认时间 && it.Timelist.Count != 0 && it.InterviewTime == Guid.Empty && it.Status != status.需调整时间).OrderBy(it => it.Timelist.Count).ToList();
+            students = context.Students.Where(it => it.Status == status.已选时间).OrderBy(it => it.Timelist.Count).ToList();
             sessions = context.Sessions.OrderBy(it => it.Day).ThenByDescending(it => it.Capacity - it.Students.Count).ThenBy(it => it.BeginTime).ThenBy(it => it.Place).ToList();
             students.Sort((Student a, Student b) =>
             {