调整学年推算方式

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -507,7 +507,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                         gradeId = gid,
                         studentIds = stu,
-                        gradeName = info.grades.Where(x => x.id == gid).FirstOrDefault().name,
+                        gradeName = info.grades.Where(x => x.id.Equals(gid)).FirstOrDefault().name,
                         stuCount = stu.Count,
                         lineCount = lineCount,
                         totalAverage = totalAverage,
@@ -1643,8 +1643,8 @@ namespace TEAMModelOS.Controllers.Analysis
                             int month = DateTimeOffset.UtcNow.Month;
                             int day = DateTimeOffset.UtcNow.Day;
                             int time = month > semester.month ? 0 : 1;
-                            int eyear = cyear - time;
-                            gradeId = (year - eyear).ToString();
+                            int eyear = year - time;
+                            gradeId = (eyear - cyear).ToString();
                         }
                     }
                 }

TEAMModelOS/Controllers/Analysis/GradeAys.cs

@@ -17,7 +17,7 @@ namespace TEAMModelOS.Controllers.Analysis
         public int lineCount { get; set; }
         public List<AysSubject> subjects { get; set; }
         public string gradeId { get; set; }
-        public string gradeName { get; set; }
+        public string? gradeName { get; set; }
         public double totalAverage { get; set; }
     }
 }