This commit is contained in:
tanglong 2025-04-03 16:36:01 +08:00
parent 1d3570ab05
commit bea3864148
56 changed files with 391 additions and 35 deletions

View File

@ -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+6016cd44d623420f7f9857fc965b58d3b6e02736")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1d3570ab05d420c438e818c395b8f56cd2046e9e")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
27e3ea9fe777fb0ed966ddcdae695af87162d88e352106961e9a61ded8409f0e
f73615320284285e2c796da3c9096ba9f23c29b5741e89e96f982658a6f1f051

View File

@ -1 +1 @@
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=6016cd44d623420f7f9857fc965b58d3b6e02736&path=/*"}}
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1d3570ab05d420c438e818c395b8f56cd2046e9e&path=/*"}}

View File

@ -88,7 +88,12 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
"linux-x64": {
"#import": []
}
}
}

View File

@ -347,6 +347,353 @@
}
}
}
},
"net6.0/linux-x64": {
"Aliyun.OSS.SDK.NetCore/2.14.1": {
"type": "package",
"compile": {
"lib/netstandard2.0/Aliyun.OSS.Core.dll": {
"related": ".pdb;.xml"
}
},
"runtime": {
"lib/netstandard2.0/Aliyun.OSS.Core.dll": {
"related": ".pdb;.xml"
}
}
},
"Microsoft.AspNetCore.Http.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Http.Features": "2.2.0",
"System.Text.Encodings.Web": "4.5.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Http.Features/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.JsonPatch/6.0.0": {
"type": "package",
"dependencies": {
"Microsoft.CSharp": "4.7.0",
"Newtonsoft.Json": "13.0.1"
},
"compile": {
"lib/net6.0/Microsoft.AspNetCore.JsonPatch.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.AspNetCore.JsonPatch.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Mvc.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Routing.Abstractions": "2.2.0",
"Microsoft.Net.Http.Headers": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Mvc.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Mvc.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.AspNetCore.Mvc.NewtonsoftJson/6.0.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.JsonPatch": "6.0.0",
"Newtonsoft.Json": "13.0.1",
"Newtonsoft.Json.Bson": "1.0.2"
},
"compile": {
"lib/net6.0/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {
"related": ".xml"
}
},
"frameworkReferences": [
"Microsoft.AspNetCore.App"
]
},
"Microsoft.AspNetCore.Routing.Abstractions/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.AspNetCore.Http.Abstractions": "2.2.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.Bcl.AsyncInterfaces/8.0.0": {
"type": "package",
"compile": {
"lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": {
"related": ".xml"
}
}
},
"Microsoft.Bcl.TimeProvider/8.0.1": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "8.0.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.Bcl.TimeProvider.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Bcl.TimeProvider.dll": {
"related": ".xml"
}
},
"build": {
"buildTransitive/net6.0/_._": {}
}
},
"Microsoft.CSharp/4.7.0": {
"type": "package",
"compile": {
"ref/netcoreapp2.0/_._": {}
},
"runtime": {
"lib/netcoreapp2.0/_._": {}
}
},
"Microsoft.Extensions.Primitives/2.2.0": {
"type": "package",
"dependencies": {
"System.Memory": "4.5.1",
"System.Runtime.CompilerServices.Unsafe": "4.5.1"
},
"compile": {
"lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Abstractions/8.3.0": {
"type": "package",
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Abstractions.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Abstractions.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.JsonWebTokens/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.TimeProvider": "8.0.1",
"Microsoft.IdentityModel.Tokens": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Logging/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Logging.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Logging.dll": {
"related": ".xml"
}
}
},
"Microsoft.IdentityModel.Tokens/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.Bcl.TimeProvider": "8.0.1",
"Microsoft.IdentityModel.Logging": "8.3.0"
},
"compile": {
"lib/net6.0/Microsoft.IdentityModel.Tokens.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Microsoft.IdentityModel.Tokens.dll": {
"related": ".xml"
}
}
},
"Microsoft.Net.Http.Headers/2.2.0": {
"type": "package",
"dependencies": {
"Microsoft.Extensions.Primitives": "2.2.0",
"System.Buffers": "4.5.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": {
"related": ".xml"
}
}
},
"Newtonsoft.Json/13.0.3": {
"type": "package",
"compile": {
"lib/net6.0/Newtonsoft.Json.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/Newtonsoft.Json.dll": {
"related": ".xml"
}
}
},
"Newtonsoft.Json.Bson/1.0.2": {
"type": "package",
"dependencies": {
"Newtonsoft.Json": "12.0.1"
},
"compile": {
"lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {
"related": ".pdb;.xml"
}
},
"runtime": {
"lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {
"related": ".pdb;.xml"
}
}
},
"System.Buffers/4.5.0": {
"type": "package",
"compile": {
"ref/netcoreapp2.0/_._": {}
},
"runtime": {
"lib/netcoreapp2.0/_._": {}
}
},
"System.IdentityModel.Tokens.Jwt/8.3.0": {
"type": "package",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "8.3.0",
"Microsoft.IdentityModel.Tokens": "8.3.0"
},
"compile": {
"lib/net6.0/System.IdentityModel.Tokens.Jwt.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/net6.0/System.IdentityModel.Tokens.Jwt.dll": {
"related": ".xml"
}
}
},
"System.Memory/4.5.1": {
"type": "package",
"compile": {
"ref/netcoreapp2.1/_._": {}
},
"runtime": {
"lib/netcoreapp2.1/_._": {}
}
},
"System.Runtime.CompilerServices.Unsafe/4.5.1": {
"type": "package",
"compile": {
"ref/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": {
"related": ".xml"
}
}
},
"System.Text.Encodings.Web/4.5.0": {
"type": "package",
"compile": {
"lib/netstandard2.0/System.Text.Encodings.Web.dll": {
"related": ".xml"
}
},
"runtime": {
"lib/netstandard2.0/System.Text.Encodings.Web.dll": {
"related": ".xml"
}
}
}
}
},
"libraries": {
@ -962,7 +1309,12 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
"linux-x64": {
"#import": []
}
}
}

View File

@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "g+fSl/Z9cbg=",
"dgSpecHash": "anCpw42W0TY=",
"success": true,
"projectFilePath": "C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj",
"expectedPackageFiles": [

View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Users\tangl\Desktop\web</_PublishTargetUrl>
<History>True|2025-03-11T09:48:55.2957005Z||;False|2025-03-11T17:48:38.1452073+08:00||;True|2025-03-07T16:31:26.6256757+08:00||;True|2025-03-07T15:14:30.2549136+08:00||;True|2025-03-07T14:57:41.5400532+08:00||;True|2025-03-07T14:53:16.1364435+08:00||;False|2025-03-07T14:52:47.3342548+08:00||;False|2025-03-07T14:52:10.7452463+08:00||;False|2025-03-07T14:51:33.5424415+08:00||;True|2025-03-07T14:46:55.5807563+08:00||;True|2025-03-07T14:33:04.1266862+08:00||;True|2025-03-07T14:13:22.6999976+08:00||;True|2025-03-07T14:05:09.5133651+08:00||;False|2025-03-07T14:02:23.5093029+08:00||;False|2025-03-07T13:58:37.4496383+08:00||;True|2025-03-07T11:52:20.4578386+08:00||;True|2025-03-07T11:31:43.1972462+08:00||;True|2025-03-07T10:11:26.1562979+08:00||;True|2025-03-07T10:10:59.9440630+08:00||;True|2025-03-07T09:24:15.8595227+08:00||;True|2025-03-06T17:52:31.4924325+08:00||;True|2025-03-06T17:52:19.1631772+08:00||;True|2025-03-06T17:32:57.7195879+08:00||;True|2025-03-06T17:09:15.6877706+08:00||;True|2025-03-06T16:59:48.0866771+08:00||;True|2025-03-06T16:49:15.3348344+08:00||;True|2025-03-06T15:51:10.7923322+08:00||;True|2025-03-06T15:46:02.5442595+08:00||;True|2025-03-06T14:32:36.1899505+08:00||;True|2025-03-06T14:04:43.6692503+08:00||;True|2025-03-06T10:00:58.4898730+08:00||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;</History>
<History>True|2025-04-03T07:07:55.2812036Z||;True|2025-03-18T10:41:46.9539024+08:00||;True|2025-03-18T09:03:55.5838708+08:00||;True|2025-03-17T12:30:21.5399192+08:00||;True|2025-03-17T11:54:27.3261861+08:00||;True|2025-03-17T11:20:23.7942104+08:00||;True|2025-03-11T17:48:55.2957005+08:00||;False|2025-03-11T17:48:38.1452073+08:00||;True|2025-03-07T16:31:26.6256757+08:00||;True|2025-03-07T15:14:30.2549136+08:00||;True|2025-03-07T14:57:41.5400532+08:00||;True|2025-03-07T14:53:16.1364435+08:00||;False|2025-03-07T14:52:47.3342548+08:00||;False|2025-03-07T14:52:10.7452463+08:00||;False|2025-03-07T14:51:33.5424415+08:00||;True|2025-03-07T14:46:55.5807563+08:00||;True|2025-03-07T14:33:04.1266862+08:00||;True|2025-03-07T14:13:22.6999976+08:00||;True|2025-03-07T14:05:09.5133651+08:00||;False|2025-03-07T14:02:23.5093029+08:00||;False|2025-03-07T13:58:37.4496383+08:00||;True|2025-03-07T11:52:20.4578386+08:00||;True|2025-03-07T11:31:43.1972462+08:00||;True|2025-03-07T10:11:26.1562979+08:00||;True|2025-03-07T10:10:59.9440630+08:00||;True|2025-03-07T09:24:15.8595227+08:00||;True|2025-03-06T17:52:31.4924325+08:00||;True|2025-03-06T17:52:19.1631772+08:00||;True|2025-03-06T17:32:57.7195879+08:00||;True|2025-03-06T17:09:15.6877706+08:00||;True|2025-03-06T16:59:48.0866771+08:00||;True|2025-03-06T16:49:15.3348344+08:00||;True|2025-03-06T15:51:10.7923322+08:00||;True|2025-03-06T15:46:02.5442595+08:00||;True|2025-03-06T14:32:36.1899505+08:00||;True|2025-03-06T14:04:43.6692503+08:00||;True|2025-03-06T10:00:58.4898730+08:00||;True|2025-03-06T09:59:50.3712985+08:00||;True|2025-03-06T09:03:59.1856247+08:00||;True|2025-03-04T17:35:37.1204893+08:00||;True|2025-03-04T17:18:56.4230027+08:00||;True|2025-03-04T16:59:02.6637491+08:00||;True|2025-03-04T15:21:05.4912749+08:00||;True|2025-03-04T15:08:42.5490957+08:00||;True|2025-03-04T15:01:08.8651148+08:00||;True|2025-03-03T17:31:47.5325183+08:00||;True|2025-03-03T17:09:05.8362354+08:00||;True|2025-03-03T16:41:37.7278763+08:00||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

View File

@ -279,7 +279,7 @@ namespace YD_XinWei.Api.Services.Impl
{
Id = item.Id,
Sex = item.Sex,
Name = "1",
Name = item.Score.GetRank().ToString(),
Score = item.Score,
Max = item.MaxValue,
Min = item.MinValue
@ -348,7 +348,7 @@ namespace YD_XinWei.Api.Services.Impl
var project = xwProject.Where(x => x.ProjectId == dto.ProjectId).FirstOrDefault();
string categoryEnum = project?.CategoryEnum ?? "";
if (dto.ProjectId == 4)
if (dto.ProjectId == 4 || dto.ProjectId == 11)
{
stu.Achievement = stu.Achievement / 10;
stu.Achievement2 = stu.Achievement2 / 10;
@ -390,8 +390,9 @@ namespace YD_XinWei.Api.Services.Impl
}
});
dto.StudentList.ForEach(x => { x.OrgId = dto.OrgId; });
var entity = _mapper.Map<XW_SportsTestData>(dto);
var res = _mapper.Map<TrainDto>(entity);
await _sportsContext.XW_SportsTestData.AddAsync(entity);
var sportsTestValueEntinys = await AddSportsTestValueEntity(dto, healthStandards, xwProject);
@ -399,6 +400,8 @@ namespace YD_XinWei.Api.Services.Impl
await _sportsContext.SaveChangesAsync();
var res = _mapper.Map<TrainDto>(entity);
Console.WriteLine("新增成功");
return res;
@ -493,7 +496,6 @@ namespace YD_XinWei.Api.Services.Impl
/// <param name="studentId"></param>
/// <param name="trainId"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public async Task<GradeRankingVo> GradeRankingGet(int studentId, int trainId)
{
var res = new GradeRankingVo();
@ -502,7 +504,6 @@ namespace YD_XinWei.Api.Services.Impl
var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
var lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddDays(-1);
var studentResults = await _sportsContext.XW_TrainStudents.Where(x => x.XW_SportsTestDataId == trainId)
.Select(x => new
{
@ -520,6 +521,8 @@ namespace YD_XinWei.Api.Services.Impl
{
return res;
}
var rankedResults = studentResults
.Where(x => x.GradeId == student.GradeId &&
DateTime.TryParse(x.CreateTime, out var createTime) &&
@ -530,7 +533,7 @@ namespace YD_XinWei.Api.Services.Impl
var studentRank = rankedResults.FirstOrDefault(x => x.StudentId == student.StudentId)?.Rank.ToString() ?? "无数据";
res.Rating = student.Rating.ToString() ?? "无数据";
res.Rating = student.Score.GetRankStr();
res.MonthRanking = studentRank;
return res;
@ -863,7 +866,7 @@ namespace YD_XinWei.Api.Services.Impl
x.Achievement,
x.CreateTime,
x.Sex
})
}).OrderByDescending(x => x.Achievement)
.ToListAsync(); // 先加载到内存
// 在内存中进行时间和性别过滤
@ -875,7 +878,7 @@ namespace YD_XinWei.Api.Services.Impl
Name = x.StudentName,
ClassName = x.ClassName,
Achievement = x.Achievement.ToString() ?? "无数据"
}).OrderByDescending(x => x.Achievement)
})
.ToList();
res.Times = dto.Times;

View File

@ -337,7 +337,6 @@
<param name="studentId"></param>
<param name="trainId"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.HistoryGet(YD_XinWei.Commons.Dto.Open.HistoryGetDto)">
<summary>

View File

@ -337,7 +337,6 @@
<param name="studentId"></param>
<param name="trainId"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.HistoryGet(YD_XinWei.Commons.Dto.Open.HistoryGetDto)">
<summary>

View File

@ -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+6016cd44d623420f7f9857fc965b58d3b6e02736")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1d3570ab05d420c438e818c395b8f56cd2046e9e")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
adcb2eabda3f2b1ca1dec49303f0165985c064b79bf0094e7fab8e1f34439e58
aa945c9c313b0b17354ffea79c9f2bce102a58031bef8b4e2612282f95f73fa2

View File

@ -1 +1 @@
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=6016cd44d623420f7f9857fc965b58d3b6e02736&path=/*"}}
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1d3570ab05d420c438e818c395b8f56cd2046e9e&path=/*"}}

View File

@ -337,7 +337,6 @@
<param name="studentId"></param>
<param name="trainId"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.HistoryGet(YD_XinWei.Commons.Dto.Open.HistoryGetDto)">
<summary>

View File

@ -337,7 +337,6 @@
<param name="studentId"></param>
<param name="trainId"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:YD_XinWei.Api.Services.Impl.XinWeiService.HistoryGet(YD_XinWei.Commons.Dto.Open.HistoryGetDto)">
<summary>

View File

@ -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+6016cd44d623420f7f9857fc965b58d3b6e02736")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1d3570ab05d420c438e818c395b8f56cd2046e9e")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
adcb2eabda3f2b1ca1dec49303f0165985c064b79bf0094e7fab8e1f34439e58
aa945c9c313b0b17354ffea79c9f2bce102a58031bef8b4e2612282f95f73fa2

View File

@ -1 +1 @@
c7d032a7a10dd76b1fab6d9aff275518c409c5407ef5e983f564063c2579a501
17bb60a178b0bac299dea927a785c223c5c733dab8bfb4a7fa393ce8c0c078a7

View File

@ -1 +1 @@
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=6016cd44d623420f7f9857fc965b58d3b6e02736&path=/*"}}
{"documents":{"C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=1d3570ab05d420c438e818c395b8f56cd2046e9e&path=/*"}}

View File

@ -88,7 +88,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
}
},
@ -211,7 +211,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
}
}

View File

@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\tangl\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.0</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\tangl\.nuget\packages\" />

View File

@ -3278,7 +3278,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
}
}

View File

@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "x76+y3d66ho=",
"dgSpecHash": "632R7VZu8RM=",
"success": true,
"projectFilePath": "C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj",
"expectedPackageFiles": [

View File

@ -88,7 +88,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
@ -222,7 +222,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {

View File

@ -4389,7 +4389,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.200\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {

View File

@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "H7YPS27R+f4=",
"dgSpecHash": "Pw4zWqWsoOw=",
"success": true,
"projectFilePath": "C:\\Users\\tangl\\Desktop\\Code\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj",
"expectedPackageFiles": [