diff --git a/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.dll
index d91a5de..5c7c292 100644
Binary files a/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.pdb
index 543fd41..d6f99f4 100644
Binary files a/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Release/net6.0/YD_XinWei.Commons.pdb differ
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 33ef74d..6cb37e3 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+5be6a4cec771d39e9c75d95a5779e2d3b2d59a7c")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41ace2a81d7fd893023371526a8a3dfc5be26f14")]
[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 0e41b6e..2030cc5 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 @@
-0fa754a8d6cbdd350c9bdc814f4e4100ab9aff1bfd8a6fb43b89d76b5ed1b5b2
+9e158e2c08ba5b0f0a75179b73063171b6c7fc60aab75858c3154b781c71ad87
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
index 2fc4013..4bf435b 100644
--- a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
+++ b/Server/YD_XinWei.Commons/obj/Release/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("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4e9670353ddb2f1b79f2b90c3614ce82639d3d6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41ace2a81d7fd893023371526a8a3dfc5be26f14")]
[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/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
index fda7e65..07ea4b4 100644
--- a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache
@@ -1 +1 @@
-c1e3d96d7ee14ecc509118e076e018ad8d56dae02415668c9b2cf44caf71ee70
+9aa4601ab2bea69778295a2f2e1b40bf81c54b41cff40cc87096c35ca031ce20
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll
index d91a5de..5c7c292 100644
Binary files a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.pdb
index 543fd41..d6f99f4 100644
Binary files a/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Release/net6.0/YD_XinWei.Commons.pdb differ
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll
index 5aa4e5f..14468b7 100644
Binary files a/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Release/net6.0/ref/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll
index 5aa4e5f..14468b7 100644
Binary files a/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Release/net6.0/refint/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
index d456d9b..686a1ca 100644
--- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs
+++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
@@ -440,6 +440,10 @@ namespace YD_XinWei.Api.Services.Impl
sportsTestValueEntity.Height = (data.Achievement ?? 0) / 10;
sportsTestValueEntity.Weight = (data.OriginalAchievement ?? 0) / 100;
}
+ else if (categoryEnum == "MeterRun_50")
+ {
+ value = (data.Achievement ?? 0) / 1000;
+ }
else
value = data.Achievement ?? 0;
@@ -457,7 +461,7 @@ namespace YD_XinWei.Api.Services.Impl
sportsTestValueEntity.Rank = standard.Rank;
}
-
+ sportsTestValueEntity.Score = (float)(data.Score ?? 0);
sportsTestValueEntity.SchoolCode = schoolCode;
sportsTestValueEntity.Sex = (int)data.Sex;
sportsTestValueEntity.DataSource = DataSource.XW;
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.dll
index 7aa4f72..4944ebc 100644
Binary files a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.exe b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.exe
index a932bc1..4b64113 100644
Binary files a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.exe and b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.exe differ
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.pdb
index 4cd9de1..3ae6069 100644
Binary files a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.xml
index 73c08a1..940f4a9 100644
--- a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.xml
+++ b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Api.xml
@@ -37,6 +37,14 @@
+
+
+ 各项目实时成绩
+
+
+
+
+
芯未
@@ -316,6 +324,14 @@
+
+
+ 各项目实时成绩
+
+
+
+
+
验证缓存项是否存在
@@ -579,6 +595,14 @@
+
+
+ 各项目实时成绩
+
+
+
+
+
服务接口
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.dll
index d91a5de..5c7c292 100644
Binary files a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.pdb
index 543fd41..d6f99f4 100644
Binary files a/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Release/net6.0/YD_XinWei.Commons.pdb differ
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 390dc94..77cf2f9 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+f644a9949f695121dc17764bbf5588a931890e45")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41ace2a81d7fd893023371526a8a3dfc5be26f14")]
[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 9fb55ab..f19a71d 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 @@
-d2ffde4bd6e5a6a96bc45bb077d08e7e1c73f8e77a76c58a75929820e412cbd7
+8b64ad7b5df0b76add2fac034a287637135abe7efcbf255ba17c6479932b3500
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 2833b55..b9baec0 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 174fd02..4b64113 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
diff --git a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfo.cs
index d23bbd8..60f8168 100644
--- a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfo.cs
+++ b/Server/YD_XinWei/obj/Release/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("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+341f092fa8a580c888825be5842538ef8cd736ce")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41ace2a81d7fd893023371526a8a3dfc5be26f14")]
[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/Release/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
index 91a4822..db66137 100644
--- a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache
@@ -1 +1 @@
-fb3ed6757d82f6f5b1248fabde49b4f166fe3361bbb119bc3d24fdc1b69a10cc
+8249c5875910602b74639a5b0d8fdb3f4f0f8fd6eafac73a108d26f8fc83b83d
diff --git a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache
index 7038ac2..840888a 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ
diff --git a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.dll
index 7aa4f72..4944ebc 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.pdb
index 4cd9de1..3ae6069 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Release/net6.0/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/obj/Release/net6.0/apphost.exe b/Server/YD_XinWei/obj/Release/net6.0/apphost.exe
index a932bc1..4b64113 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/apphost.exe and b/Server/YD_XinWei/obj/Release/net6.0/apphost.exe differ
diff --git a/Server/YD_XinWei/obj/Release/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Release/net6.0/ref/YD_XinWei.Api.dll
index 8ca543d..c03dca5 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Release/net6.0/ref/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Release/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Release/net6.0/refint/YD_XinWei.Api.dll
index 8ca543d..c03dca5 100644
Binary files a/Server/YD_XinWei/obj/Release/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Release/net6.0/refint/YD_XinWei.Api.dll differ