diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll index 2b68206..2223fb8 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb index 6f30240..c496437 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Debug/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 fdd533d..514799e 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+929774988031cca82bdac9706a3078d4cad66bea")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6caede78804ab141c47823cbc5ed08828a6c839c")] [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 23517d5..9ab2212 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 @@ -0d957c58615c426610070e828d0dddcdda8dbaf31fef27c72b605d896fc6ad58 +e06c61964e3c6ea78f081b80337a298652eeb6dbe5a2060723b055328592973e diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll index 2b68206..2223fb8 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb index 6f30240..c496437 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json index 27cb8d6..7d86539 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\TangLong\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=929774988031cca82bdac9706a3078d4cad66bea&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\TangLong\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=6caede78804ab141c47823cbc5ed08828a6c839c&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll index 7cf1ff3..68312aa 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll index 7cf1ff3..68312aa 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ 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 aced904..4123ffd 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 @@ -91,11 +91,6 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" } - }, - "runtimes": { - "linux-x64": { - "#import": [] - } } } } diff --git a/Server/YD_XinWei.Commons/obj/project.assets.json b/Server/YD_XinWei.Commons/obj/project.assets.json index 63229e3..acc1f01 100644 --- a/Server/YD_XinWei.Commons/obj/project.assets.json +++ b/Server/YD_XinWei.Commons/obj/project.assets.json @@ -347,353 +347,6 @@ } } } - }, - "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": { @@ -1313,11 +966,6 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100\\RuntimeIdentifierGraph.json" } - }, - "runtimes": { - "linux-x64": { - "#import": [] - } } }, "logs": [ @@ -1328,8 +976,7 @@ "message": "包 \"System.Text.Encodings.Web\" 4.5.0 具有已知的 严重 严重性漏洞，https://github.com/advisories/GHSA-ghhp-997w-qr28", "libraryId": "System.Text.Encodings.Web", "targetGraphs": [ - "net6.0", - "net6.0/linux-x64" + "net6.0" ] } ] diff --git a/Server/YD_XinWei.Commons/obj/project.nuget.cache b/Server/YD_XinWei.Commons/obj/project.nuget.cache index 70f9db9..a0344b1 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": "SKnWqtqGijw=", + "dgSpecHash": "wKC9CAFzTlg=", "success": true, "projectFilePath": "C:\\Users\\TangLong\\Desktop\\Code\\YD_XinWei\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj", "expectedPackageFiles": [ @@ -36,8 +36,7 @@ "message": "包 \"System.Text.Encodings.Web\" 4.5.0 具有已知的 严重 严重性漏洞，https://github.com/advisories/GHSA-ghhp-997w-qr28", "libraryId": "System.Text.Encodings.Web", "targetGraphs": [ - "net6.0", - "net6.0/linux-x64" + "net6.0" ] } ] diff --git a/Server/YD_XinWei/Controllers/XinWeiController.cs b/Server/YD_XinWei/Controllers/XinWeiController.cs index c698a8b..d812c6c 100644 --- a/Server/YD_XinWei/Controllers/XinWeiController.cs +++ b/Server/YD_XinWei/Controllers/XinWeiController.cs @@ -60,11 +60,11 @@ namespace YD_XinWei.Api.Controllers } /// - /// 获取体育项目列表 + /// 获取学生信息 /// /// [HttpGet] - [Route("/basic/basic/{apiVersion}/open/getMinimumOfStudentInfoList")] + [Route("/sports/{apiVersion}/roster/getMinimumOfStudentInfoList")] public async Task> GetMinimumOfStudentInfoList(int orgId) { var res = await _xinWeiService.MinimumOfStudentInfoList(orgId); diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs index b3f8db9..23a9c22 100644 --- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs +++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs @@ -42,7 +42,7 @@ namespace YD_XinWei.Api.Services.Impl /// public async Task DeviceInfo(string deviceSerial) { - var deviceInfo = await _sportsContext.XW_Device.FirstAsync(x => x.DeviceSerial == deviceSerial); + var deviceInfo = await _sportsContext.XW_Device.FirstOrDefaultAsync(x => x.DeviceSerial == deviceSerial); var res = _mapper.Map(deviceInfo); return res; } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs index 39f188a..4c55620 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_SportsTestData.cs @@ -206,7 +206,7 @@ namespace VOL.Entity.DomainModels.XinWei /// [Display(Name = "MaleCount")] [Comment("男生总成绩")] - public decimal? MaleCount { get; set; } + public float? MaleCount { get; set; } /// /// 男生最大值 @@ -227,7 +227,7 @@ namespace VOL.Entity.DomainModels.XinWei /// [Display(Name = "FemaleCount")] [Comment("女生总成绩")] - public decimal? FemaleCount { get; set; } + public float? FemaleCount { get; set; } /// /// 女生最大值 @@ -248,42 +248,42 @@ namespace VOL.Entity.DomainModels.XinWei /// [Display(Name = "MaleScore")] [Comment("男生总分数")] - public decimal? MaleScore { get; set; } + public float? MaleScore { get; set; } /// /// 男生最大分数 /// [Display(Name = "MaleMaxScore")] [Comment("男生最大分数")] - public decimal? MaleMaxScore { get; set; } + public float? MaleMaxScore { get; set; } /// /// 男生最小分数 /// [Display(Name = "MaleMinScore")] [Comment("男生最小分数")] - public decimal? MaleMinScore { get; set; } + public float? MaleMinScore { get; set; } /// /// 女生总分数 /// [Display(Name = "FemaleScore")] [Comment("女生总分数")] - public decimal? FemaleScore { get; set; } + public float? FemaleScore { get; set; } /// /// 女生最大分数 /// [Display(Name = "FemaleMaxScore")] [Comment("女生最大分数")] - public decimal? FemaleMaxScore { get; set; } + public float? FemaleMaxScore { get; set; } /// /// 女生最小分数 /// [Display(Name = "FemaleMinScore")] [Comment("女生最小分数")] - public decimal? FemaleMinScore { get; set; } + public float? FemaleMinScore { get; set; } /// /// 男生优秀人数 @@ -346,49 +346,49 @@ namespace VOL.Entity.DomainModels.XinWei /// [Display(Name = "PassingRate")] [Comment("及格率")] - public decimal? PassingRate { get; set; } + public float? PassingRate { get; set; } /// /// 男生平均个数 /// [Display(Name = "MaleAvgCount")] [Comment("男生平均个数")] - public decimal? MaleAvgCount { get; set; } + public float? MaleAvgCount { get; set; } /// /// 女生平均个数 /// [Display(Name = "FemaleAvgCount")] [Comment("女生平均个数")] - public decimal? FemaleAvgCount { get; set; } + public float? FemaleAvgCount { get; set; } /// /// 男生平均分数 /// [Display(Name = "MaleAvgScore")] [Comment("男生平均分数")] - public decimal? MaleAvgScore { get; set; } + public float? MaleAvgScore { get; set; } /// /// 女生平均分数 /// [Display(Name = "FemaleAvgScore")] [Comment("女生平均分数")] - public decimal? FemaleAvgScore { get; set; } + public float? FemaleAvgScore { get; set; } /// /// 男生中位数 /// [Display(Name = "MaleMedianCount")] [Comment("男生中位数")] - public decimal? MaleMedianCount { get; set; } + public float? MaleMedianCount { get; set; } /// /// 女生中位数 /// [Display(Name = "FemaleMedianCount")] [Comment("女生中位数")] - public decimal? FemaleMedianCount { get; set; } + public float? FemaleMedianCount { get; set; } /// /// 男生平均值 @@ -437,42 +437,42 @@ namespace VOL.Entity.DomainModels.XinWei /// [Display(Name = "MaleAvgImproveScore")] [Comment("男生平均分数")] - public decimal? MaleAvgImproveScore { get; set; } + public float? MaleAvgImproveScore { get; set; } /// /// 男生最大分数 /// [Display(Name = "MaleMaxImproveScore")] [Comment("男生最大分数")] - public decimal? MaleMaxImproveScore { get; set; } + public float? MaleMaxImproveScore { get; set; } /// /// 男生最小分数 /// [Display(Name = "MaleMinImproveScore")] [Comment("男生最小分数")] - public decimal? MaleMinImproveScore { get; set; } + public float? MaleMinImproveScore { get; set; } /// /// 女生平均分数 /// [Display(Name = "FemaleAvgImproveScore")] [Comment("女生平均分数")] - public decimal? FemaleAvgImproveScore { get; set; } + public float? FemaleAvgImproveScore { get; set; } /// /// 女生最大分数 /// [Display(Name = "FemaleMaxImproveScore")] [Comment("女生最大分数")] - public decimal? FemaleMaxImproveScore { get; set; } + public float? FemaleMaxImproveScore { get; set; } /// /// 女生最小分数 /// [Display(Name = "FemaleMinImproveScore")] [Comment("女生最小分数")] - public decimal? FemaleMinImproveScore { get; set; } + public float? FemaleMinImproveScore { get; set; } /// /// 失误最少的同学次数 diff --git a/Server/YD_XinWei/Startup.cs b/Server/YD_XinWei/Startup.cs index b812566..ebab4ad 100644 --- a/Server/YD_XinWei/Startup.cs +++ b/Server/YD_XinWei/Startup.cs @@ -152,7 +152,7 @@ namespace YD_XinWei.Api services.AddSwaggerGen(c => { //分为2份接口文档 - c.SwaggerDoc("v1", new OpenApiInfo { Title = "YD_XinWei.Api", Version = "v1", Description = "跃动小程序Api" }); + c.SwaggerDoc("v1", new OpenApiInfo { Title = "YD_XinWei.Api", Version = "v1", Description = "芯未Api" }); string xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll index bd983a9..b8a0d18 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe index 7696d84..5f59279 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb index f79112f..3cc3f4b 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml index fb85c31..33a87a9 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml @@ -39,7 +39,7 @@ - 获取体育项目列表 + 获取学生信息 diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll index 2b68206..2223fb8 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb index 6f30240..c496437 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json index 09c6e09..819df34 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json @@ -71,37 +71,6 @@ } ] }, - { - "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", - "Method": "GetMinimumOfStudentInfoList", - "RelativePath": "basic/basic/{apiVersion}/open/getMinimumOfStudentInfoList", - "HttpMethod": "GET", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "orgId", - "Type": "System.Int32", - "IsRequired": false - }, - { - "Name": "apiVersion", - "Type": "", - "IsRequired": true - } - ], - "ReturnTypes": [ - { - "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Open.StudentInfoDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] - }, { "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", "Method": "GetOrgSportsProjectList", @@ -190,6 +159,37 @@ } ] }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "GetMinimumOfStudentInfoList", + "RelativePath": "sports/{apiVersion}/roster/getMinimumOfStudentInfoList", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "orgId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Open.StudentInfoDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", "Method": "AddTrain", 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 cffa317..968cfe9 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 @@ -2,7 +2,7 @@ "openapi": "3.0.1", "info": { "title": "YD_XinWei.Api", - "description": "跃动小程序Api", + "description": "芯未Api", "version": "v1" }, "paths": { @@ -159,12 +159,12 @@ } } }, - "/basic/basic/{apiVersion}/open/getMinimumOfStudentInfoList": { + "/sports/{apiVersion}/roster/getMinimumOfStudentInfoList": { "get": { "tags": [ "XinWei" ], - "summary": "获取体育项目列表", + "summary": "获取学生信息", "parameters": [ { "name": "orgId", 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 6fd52d5..7ec5ef8 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+929774988031cca82bdac9706a3078d4cad66bea")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6caede78804ab141c47823cbc5ed08828a6c839c")] [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 cc3b000..18dad75 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 @@ -01119a8d8ca22ec2c3960151c3147a38bf3af59894d4f1393244da553fc3e0b9 +574c2fd259e9a34def88bffdece805ba5bf75afe49ebc069647a69a6c92ce3c6 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 f4b605f..b84173d 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/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll index bd983a9..b8a0d18 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb index f79112f..3cc3f4b 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json index 27cb8d6..7d86539 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\TangLong\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=929774988031cca82bdac9706a3078d4cad66bea&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\TangLong\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=6caede78804ab141c47823cbc5ed08828a6c839c&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml index fb85c31..33a87a9 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml @@ -39,7 +39,7 @@ - 获取体育项目列表 + 获取学生信息 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe index 7696d84..5f59279 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/Debug/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll index 977098e..f285591 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll index 977098e..f285591 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll differ