This commit is contained in:
tanglong 2025-08-25 16:44:36 +08:00
parent f5873892e1
commit bd96de2331
9 changed files with 15 additions and 13 deletions

View File

@ -115,7 +115,7 @@ namespace YD_XinWei.Commons.Dto.LargeScreen
/// <summary> /// <summary>
/// 成绩 /// 成绩
/// </summary> /// </summary>
public float Value { get; set; } public string Value { get; set; }
} }
/// <summary> /// <summary>
@ -177,7 +177,7 @@ namespace YD_XinWei.Commons.Dto.LargeScreen
/// <summary> /// <summary>
/// 成绩 /// 成绩
/// </summary> /// </summary>
public float Value { get; set; } public string Value { get; set; }
/// <summary> /// <summary>
/// 得分 /// 得分

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+341f092fa8a580c888825be5842538ef8cd736ce")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f5873892e13dd05303d2e1923728ae8145db3bb6")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
1708079e145a5349ba8f93613ca137b030746ca998b017e978e57cde07ebdb63 d21e18119644687bb8f18dacf75e94d588ea9b595ad50be25d576d64e50b4a48

View File

@ -148,7 +148,7 @@ namespace YD_XinWei.Api.Services.Impl
Rank = index + 1, Rank = index + 1,
StudentNo = x.StudentNo, StudentNo = x.StudentNo,
StudentName = x.StudentName, StudentName = x.StudentName,
Value = x.Value Value = x.CategoryValue == 1 ? $"{x.Height}cm/{x.Weight}kg" : $"{x.Value}{((SportsTestItemType)x.CategoryValue).GetUnit()}"
}).ToList(), }).ToList(),
// 女生前十名 // 女生前十名
@ -160,7 +160,7 @@ namespace YD_XinWei.Api.Services.Impl
Rank = index + 1, Rank = index + 1,
StudentNo = x.StudentNo, StudentNo = x.StudentNo,
StudentName = x.StudentName, StudentName = x.StudentName,
Value = x.Value Value = x.CategoryValue == 1 ? $"{x.Height}cm/{x.Weight}kg" : $"{x.Value}{((SportsTestItemType)x.CategoryValue).GetUnit()}"
}).ToList() }).ToList()
}) })
.ToList(); .ToList();
@ -266,6 +266,8 @@ namespace YD_XinWei.Api.Services.Impl
s.ClassName, s.ClassName,
s.CategoryValue, s.CategoryValue,
s.Value, s.Value,
s.Weight,
s.Height,
s.Score, s.Score,
s.Rank, s.Rank,
s.ScoreTime s.ScoreTime
@ -289,7 +291,7 @@ namespace YD_XinWei.Api.Services.Impl
Photo = studentPhotoDict.TryGetValue(x.StudentNo, out var photo) ? photo : string.Empty, Photo = studentPhotoDict.TryGetValue(x.StudentNo, out var photo) ? photo : string.Empty,
GradeAndClassName = $"{x.GradeName}-{x.ClassName}", GradeAndClassName = $"{x.GradeName}-{x.ClassName}",
CategoryValue = x.CategoryValue, CategoryValue = x.CategoryValue,
Value = x.Value, Value = x.CategoryValue == 1 ? $"{x.Height}cm/{x.Weight}kg" : $"{x.Value}{((SportsTestItemType)x.CategoryValue).GetUnit()}",
Score = x.Score, Score = x.Score,
Rank = string.IsNullOrEmpty(x.Rank) ? "不及格" : x.Rank, Rank = string.IsNullOrEmpty(x.Rank) ? "不及格" : x.Rank,
ScoreTime = x.ScoreTime.ToString("yyyy-MM-dd HH:mm:ss") ScoreTime = x.ScoreTime.ToString("yyyy-MM-dd HH:mm:ss")

View File

@ -1971,8 +1971,8 @@
"format": "int32" "format": "int32"
}, },
"value": { "value": {
"type": "number", "type": "string",
"format": "float" "nullable": true
}, },
"score": { "score": {
"type": "number", "type": "number",
@ -2564,8 +2564,8 @@
"nullable": true "nullable": true
}, },
"value": { "value": {
"type": "number", "type": "string",
"format": "float" "nullable": true
} }
}, },
"additionalProperties": false "additionalProperties": false

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+341f092fa8a580c888825be5842538ef8cd736ce")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f5873892e13dd05303d2e1923728ae8145db3bb6")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
8ce3d5257b77dd9e592a416ee265e34ae00f20179d1a5c89fc4b381f454e6dd5 1b55e451e5df8b5cfbeba624584454d98ac4b71c594cd85758e5968810368ab3