From 513c21a42615b2eb225b3a73ef110cf1f99411ff Mon Sep 17 00:00:00 2001 From: tanglong <842690096@qq.com> Date: Tue, 26 Aug 2025 09:24:21 +0800 Subject: [PATCH] dd --- .../Services/Impl/LargeScreenService.cs | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs index 92b63fe..7d8c0d2 100644 --- a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs +++ b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs @@ -227,6 +227,28 @@ namespace YD_XinWei.Api.Services.Impl //res.ItemRealTimeResultList = realTimeResults; + var today = DateTime.Today; + + // 本周一 + var startOfThisWeek = today.AddDays(-(int)today.DayOfWeek + 1); + + // 下周一(= 本周结束时间) + var startOfNextWeek = startOfThisWeek.AddDays(7); + + // 上周一 + var startOfLastWeek = startOfThisWeek.AddDays(-7); + + // 本周数据 + var thisWeekCount = sportsTestData + .Count(x => x.ScoreTime >= startOfThisWeek && x.ScoreTime < startOfNextWeek); + + // 上周数据 + var lastWeekCount = sportsTestData + .Count(x => x.ScoreTime >= startOfLastWeek && x.ScoreTime < startOfThisWeek); + + res.BasicInfo.WeekTrainingCount = thisWeekCount; + res.BasicInfo.Increase = thisWeekCount - lastWeekCount; + return res; } @@ -276,7 +298,7 @@ namespace YD_XinWei.Api.Services.Impl .ToListAsync(); // 2. 内存分组取每个学生最新一条 - var latestPerStudent = sourceData.OrderBy(x=>x.ScoreTime).ToList(); + var latestPerStudent = sourceData.OrderBy(x => x.ScoreTime).ToList(); // 3. 映射到 DTO var realTimeResults = latestPerStudent