From 0019004465c7fbc33b3b78751393edfff60d6e3d Mon Sep 17 00:00:00 2001 From: ltx <1006158920@qq.com> Date: Mon, 13 Jul 2026 15:39:15 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9C=80?= =?UTF-8?q?=E5=A5=BD=E6=88=90=E7=BB=A9=E5=B1=95=E7=A4=BA=E4=B8=BA=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WeChatApplet/Services/Impl/TeacherService.cs | 18 ++++++++++-------- WeChatApplet/appsettings.json | 8 ++++---- .../Dto/Teacher/DataStatisticsDetailsDto.cs | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/WeChatApplet/Services/Impl/TeacherService.cs b/WeChatApplet/Services/Impl/TeacherService.cs index baf66d4..0eddfc9 100644 --- a/WeChatApplet/Services/Impl/TeacherService.cs +++ b/WeChatApplet/Services/Impl/TeacherService.cs @@ -270,7 +270,8 @@ namespace YD_WeChatApplet.Services Score = x.Score, AdditionalScore = x.AdditionalScore, CategoryValue = x.CategoryValue, - Rank = x.Rank + Rank = x.Rank, + ScoreTime = x.ScoreTime }).ToListAsync(); var aiQuery = await _sportsContext.SportsTestData.Where(x => x.IsDisplay && x.SchoolCode == student.SchoolCode && x.StudentNo == dto.StudentNo).Select(x => new SportsTestValueModel() @@ -280,7 +281,8 @@ namespace YD_WeChatApplet.Services Score = x.Score, AdditionalScore = x.AdditionalScore, CategoryValue = x.CategoryValue, - Rank = x.Rank + Rank = x.Rank, + ScoreTime = x.ScoreTime }).ToListAsync(); var sportsTestResults = iotQuery.Concat(aiQuery).ToList(); @@ -297,18 +299,18 @@ namespace YD_WeChatApplet.Services foreach (var item in categorys) { - var maxResult = sportsTestResults.Where(x => x.CategoryValue == item.Id).OrderByDescending(x => x.Value).FirstOrDefault(); + var latestResult = sportsTestResults.Where(x => x.CategoryValue == item.Id).OrderByDescending(x => x.ScoreTime).FirstOrDefault(); res.CategoryScoreList.Add(new CategoryScore() { CategoryName = item.CategoryName, - Value = maxResult != null ? Math.Round((double)maxResult.Value, 0) : 0, - Score = maxResult?.Score ?? 0, - Rank = maxResult?.Rank ?? "" + Value = latestResult != null ? Math.Round((double)latestResult.Value, 0) : 0, + Score = latestResult?.Score ?? 0, + Rank = latestResult?.Rank ?? "" }); - double currentScore = maxResult?.Score ?? 0; - double currentAdditionalScore = maxResult?.AdditionalScore ?? 0; + double currentScore = latestResult?.Score ?? 0; + double currentAdditionalScore = latestResult?.AdditionalScore ?? 0; // 累积分数 totalScore += ((currentScore + currentAdditionalScore) * item.Weight); diff --git a/WeChatApplet/appsettings.json b/WeChatApplet/appsettings.json index 61a8885..8d491f6 100644 --- a/WeChatApplet/appsettings.json +++ b/WeChatApplet/appsettings.json @@ -28,11 +28,11 @@ "RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=4", - //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=YD_WeChatAppletDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", - //"SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", + "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=YD_WeChatAppletDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", + "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=qa;Password=Admin@123;Connect Timeout=500;", - "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=YD_WeChatAppletDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", - "SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=YD_WeChatAppletDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + //"SmartSportsString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9993,http://localhost:9993", "WeChat": { diff --git a/YD_WeChatApplet.Commons/Dto/Teacher/DataStatisticsDetailsDto.cs b/YD_WeChatApplet.Commons/Dto/Teacher/DataStatisticsDetailsDto.cs index f81df75..8046613 100644 --- a/YD_WeChatApplet.Commons/Dto/Teacher/DataStatisticsDetailsDto.cs +++ b/YD_WeChatApplet.Commons/Dto/Teacher/DataStatisticsDetailsDto.cs @@ -60,7 +60,7 @@ namespace YD_WeChatApplet.Commons.Dto.Teacher public string CategoryName { get; set; } /// - /// 最好分数 + /// 最新成绩 /// public double Value { get; set; }