Merge branch 'dev' of http://8.153.108.90:3000/YD/YD_SmartSports.Api into dev

VOL.Business/Services/Norm/N_SportsTestResultService.cs

@@ -1628,6 +1628,7 @@ namespace VOL.Business.Services
                             GradeId = r.Id,
                             GradeName = r.GradeName,
                             StudentNo = r.StudentNo,
+                            StudentName = r.StudentName,
                             CategoryName = c.CategoryName,
                             ClassId = r.ClassId,
                             ClassName = r.ClassName,
@@ -1641,7 +1642,8 @@ namespace VOL.Business.Services
                             Rank = r.Rank,
                             CategoryId = c.Id,
                             Score = r.Score,
-                            Sex = r.Sex == SexType.Male ? "男" : "女"
+                            Sex = r.Sex == SexType.Male ? "男" : "女",
+                            ScoreTime = r.ScoreTime
                         };
 
             if (!string.IsNullOrWhiteSpace(paramDto.StudentNo))
@@ -1676,7 +1678,7 @@ namespace VOL.Business.Services
 
             res.Total = await query.CountAsync();
 
-            var list = await query
+            var list = await query.OrderByDescending(x => x.ScoreTime)
                  .Skip((paramDto.PageIndex - 1) * paramDto.PageSize)
                  .Take(paramDto.PageSize)
                  .ToListAsync();

VOL.Model/Norm/Response/StudentsTestDataModel.cs

@@ -63,6 +63,12 @@ namespace VOL.Model
         [Display(Name = "学生学号")]
         public string StudentNo { get; set; }
 
+        /// <summary>
+        ///学生姓名
+        /// </summary>
+        [Display(Name = "学生姓名")]
+        public string StudentName { get; set; }
+
         /// <summary>
         ///性别
         /// </summary>
@@ -123,5 +129,10 @@ namespace VOL.Model
         [Display(Name = "备注")]
         public string Remarks { get; set; }
 
+        /// <summary>
+        /// 测试时间
+        /// </summary>
+        public DateTime ScoreTime { get; set; }
+
     }
 }