From a826a3542ca0baafd972e3f53ede92c10db95f36 Mon Sep 17 00:00:00 2001 From: tanglong <842690096@qq.com> Date: Thu, 10 Sep 2026 09:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs | 2 +- .../YD_XinWei.Commons.AssemblyInfoInputs.cache | 2 +- .../obj/YD_XinWei.Commons.csproj.nuget.dgspec.json | 2 +- Server/YD_XinWei.Commons/obj/project.assets.json | 2 +- Server/YD_XinWei.Commons/obj/project.nuget.cache | 2 +- Server/YD_XinWei/Services/Impl/XinWeiService.cs | 13 +++++++++++++ .../obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs | 2 +- .../net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache | 2 +- .../obj/YD_XinWei.Api.csproj.nuget.dgspec.json | 4 ++-- Server/YD_XinWei/obj/project.assets.json | 2 +- Server/YD_XinWei/obj/project.nuget.cache | 2 +- 11 files changed, 24 insertions(+), 11 deletions(-) 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 7a52607..79bfd8c 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+5b472670430107c0bd350cea75501a5b21941d5b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ba7ff9d46e66d1ef7128cd700b28a6d522c307e")] [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 52ddaea..26ab9e5 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 @@ -07ae65f262b28d2a0c56caa1433b98f9bb8cbda92e1d412271e7832f91edb2ff +bd1ba78b9486de34fb47107440dc3d5312c8176bdff7c7b7a08057b652ea031e diff --git a/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json b/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json index 79addc2..64a9f17 100644 --- a/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json +++ b/Server/YD_XinWei.Commons/obj/YD_XinWei.Commons.csproj.nuget.dgspec.json @@ -90,7 +90,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei.Commons/obj/project.assets.json b/Server/YD_XinWei.Commons/obj/project.assets.json index 616b0a5..d2cc4f2 100644 --- a/Server/YD_XinWei.Commons/obj/project.assets.json +++ b/Server/YD_XinWei.Commons/obj/project.assets.json @@ -964,7 +964,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei.Commons/obj/project.nuget.cache b/Server/YD_XinWei.Commons/obj/project.nuget.cache index 1e62454..a7630d3 100644 --- a/Server/YD_XinWei.Commons/obj/project.nuget.cache +++ b/Server/YD_XinWei.Commons/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "5OZ5DLxmp9k=", + "dgSpecHash": "LaqeB//Jw3s=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "expectedPackageFiles": [ diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs index ed50072..321a2ab 100644 --- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs +++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs @@ -513,6 +513,19 @@ namespace YD_XinWei.Api.Services.Impl sportsTestValueEntity.Weight = (float)(data.OriginalAchievement.HasValue ? Math.Round(data.OriginalAchievement.Value / 100.0, 2) : 0); } + //中长跑 + if (dto.ProjectId == 2) + { + // 只除以1000,保留两位小数 + value = (float)(data.Achievement.HasValue ? Math.Round(data.Achievement.Value / 1000.0, 2) : 0); + + if (data.Sex == 1) + + categoryEnum = "MeterRun_1000"; + else + categoryEnum = "MeterRun_800"; + } + var standard = healthStandards.Where(x => x.CategoryEnum.Equals(categoryEnum) && 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 3df0857..721dd48 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+5b472670430107c0bd350cea75501a5b21941d5b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ba7ff9d46e66d1ef7128cd700b28a6d522c307e")] [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 6f8e47e..b0377e5 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 @@ -56a406c20c3d70806f543b172f1697d24c14976344f45353118346846f2d8b9b +fa3f24f6284997e61497fb62d3017a5cc352863cdecabd45383cb110baea13cd diff --git a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json index d0dfe02..eebfc50 100644 --- a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json +++ b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json @@ -90,7 +90,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" } } }, @@ -219,7 +219,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei/obj/project.assets.json b/Server/YD_XinWei/obj/project.assets.json index abfbd67..95ac339 100644 --- a/Server/YD_XinWei/obj/project.assets.json +++ b/Server/YD_XinWei/obj/project.assets.json @@ -3372,7 +3372,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.400\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/Server/YD_XinWei/obj/project.nuget.cache b/Server/YD_XinWei/obj/project.nuget.cache index cbd6c83..2572713 100644 --- a/Server/YD_XinWei/obj/project.nuget.cache +++ b/Server/YD_XinWei/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "we3aLuLXZL4=", + "dgSpecHash": "l/ACpe2Pd50=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei.Api\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "expectedPackageFiles": [