update:修改最好成绩展示为最新成绩

This commit is contained in:
ltx 2026-07-13 15:39:15 +08:00
parent c28da1d332
commit 0019004465
3 changed files with 15 additions and 13 deletions

View File

@ -270,7 +270,8 @@ namespace YD_WeChatApplet.Services
Score = x.Score, Score = x.Score,
AdditionalScore = x.AdditionalScore, AdditionalScore = x.AdditionalScore,
CategoryValue = x.CategoryValue, CategoryValue = x.CategoryValue,
Rank = x.Rank Rank = x.Rank,
ScoreTime = x.ScoreTime
}).ToListAsync(); }).ToListAsync();
var aiQuery = await _sportsContext.SportsTestData.Where(x => x.IsDisplay && x.SchoolCode == student.SchoolCode && x.StudentNo == dto.StudentNo).Select(x => new SportsTestValueModel() 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, Score = x.Score,
AdditionalScore = x.AdditionalScore, AdditionalScore = x.AdditionalScore,
CategoryValue = x.CategoryValue, CategoryValue = x.CategoryValue,
Rank = x.Rank Rank = x.Rank,
ScoreTime = x.ScoreTime
}).ToListAsync(); }).ToListAsync();
var sportsTestResults = iotQuery.Concat(aiQuery).ToList(); var sportsTestResults = iotQuery.Concat(aiQuery).ToList();
@ -297,18 +299,18 @@ namespace YD_WeChatApplet.Services
foreach (var item in categorys) 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() res.CategoryScoreList.Add(new CategoryScore()
{ {
CategoryName = item.CategoryName, CategoryName = item.CategoryName,
Value = maxResult != null ? Math.Round((double)maxResult.Value, 0) : 0, Value = latestResult != null ? Math.Round((double)latestResult.Value, 0) : 0,
Score = maxResult?.Score ?? 0, Score = latestResult?.Score ?? 0,
Rank = maxResult?.Rank ?? "" Rank = latestResult?.Rank ?? ""
}); });
double currentScore = maxResult?.Score ?? 0; double currentScore = latestResult?.Score ?? 0;
double currentAdditionalScore = maxResult?.AdditionalScore ?? 0; double currentAdditionalScore = latestResult?.AdditionalScore ?? 0;
// 累积分数 // 累积分数
totalScore += ((currentScore + currentAdditionalScore) * item.Weight); totalScore += ((currentScore + currentAdditionalScore) * item.Weight);

View File

@ -28,11 +28,11 @@
"RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=4", "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;", "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;", "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;", //"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;", //"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", "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9993,http://localhost:9993",
"WeChat": { "WeChat": {

View File

@ -60,7 +60,7 @@ namespace YD_WeChatApplet.Commons.Dto.Teacher
public string CategoryName { get; set; } public string CategoryName { get; set; }
/// <summary> /// <summary>
/// 最好分数 /// 最新成绩
/// </summary> /// </summary>
public double Value { get; set; } public double Value { get; set; }