diff --git a/Server/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs b/Server/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs
index ed5ae1b..1d63797 100644
--- a/Server/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs
+++ b/Server/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs
@@ -115,7 +115,7 @@ namespace YD_XinWei.Commons.Dto.LargeScreen
///
/// 成绩
///
- public float Value { get; set; }
+ public string Value { get; set; }
}
///
@@ -177,7 +177,7 @@ namespace YD_XinWei.Commons.Dto.LargeScreen
///
/// 成绩
///
- public float Value { get; set; }
+ public string Value { get; set; }
///
/// 得分
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
index b59f337..d070a20 100644
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[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.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
index 7a37f69..ce2e8dc 100644
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1708079e145a5349ba8f93613ca137b030746ca998b017e978e57cde07ebdb63
+d21e18119644687bb8f18dacf75e94d588ea9b595ad50be25d576d64e50b4a48
diff --git a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
index 8b321b6..b582074 100644
--- a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
+++ b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs
@@ -148,7 +148,7 @@ namespace YD_XinWei.Api.Services.Impl
Rank = index + 1,
StudentNo = x.StudentNo,
StudentName = x.StudentName,
- Value = x.Value
+ Value = x.CategoryValue == 1 ? $"{x.Height}cm/{x.Weight}kg" : $"{x.Value}{((SportsTestItemType)x.CategoryValue).GetUnit()}"
}).ToList(),
// 女生前十名
@@ -160,7 +160,7 @@ namespace YD_XinWei.Api.Services.Impl
Rank = index + 1,
StudentNo = x.StudentNo,
StudentName = x.StudentName,
- Value = x.Value
+ Value = x.CategoryValue == 1 ? $"{x.Height}cm/{x.Weight}kg" : $"{x.Value}{((SportsTestItemType)x.CategoryValue).GetUnit()}"
}).ToList()
})
.ToList();
@@ -266,6 +266,8 @@ namespace YD_XinWei.Api.Services.Impl
s.ClassName,
s.CategoryValue,
s.Value,
+ s.Weight,
+ s.Height,
s.Score,
s.Rank,
s.ScoreTime
@@ -289,7 +291,7 @@ namespace YD_XinWei.Api.Services.Impl
Photo = studentPhotoDict.TryGetValue(x.StudentNo, out var photo) ? photo : string.Empty,
GradeAndClassName = $"{x.GradeName}-{x.ClassName}",
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,
Rank = string.IsNullOrEmpty(x.Rank) ? "不及格" : x.Rank,
ScoreTime = x.ScoreTime.ToString("yyyy-MM-dd HH:mm:ss")
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json
index 72c135d..8eaadc7 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json
+++ b/Server/YD_XinWei/obj/Debug/net6.0/EndpointInfo/YD_XinWei.Api.json
@@ -1971,8 +1971,8 @@
"format": "int32"
},
"value": {
- "type": "number",
- "format": "float"
+ "type": "string",
+ "nullable": true
},
"score": {
"type": "number",
@@ -2564,8 +2564,8 @@
"nullable": true
},
"value": {
- "type": "number",
- "format": "float"
+ "type": "string",
+ "nullable": true
}
},
"additionalProperties": false
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs
index 3d895d5..76774c8 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs
+++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[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.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
index b491f72..39a7211 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
@@ -1 +1 @@
-8ce3d5257b77dd9e592a416ee265e34ae00f20179d1a5c89fc4b381f454e6dd5
+1b55e451e5df8b5cfbeba624584454d98ac4b71c594cd85758e5968810368ab3
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache
index 18a4d9d..1c91620 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
index a932bc1..6b31073 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe and b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe differ