列表

2025-03-06 11:22:44 +08:00 · 2025-03-06 11:22:44 +08:00 · ebc7ab82ab
commit ebc7ab82ab
parent 109d7c5045
30 changed files with 375 additions and 31 deletions
--- 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+31abd812e401009acc58430cfab4fbfbbe0966bf")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
 [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
 [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- 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 @@
-9f8514f3e2ff59d77b858045c6b338d75c2db1071a33d23b276b76f6a7cf1881
+6da7c6bf0bc6ccfc5303a8d7bf8ed23f75e85e6282e546017922f1ebd475af5a
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache
--- 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,6 +90,11 @@
          },
          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json"
        }
+      },
+      "runtimes": {
+        "linux-x64": {
+          "#import": []
+        }
      }
    }
  }
--- a/Server/YD_XinWei.Commons/obj/project.assets.json
+++ b/Server/YD_XinWei.Commons/obj/project.assets.json
@ -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": {
@ -964,14 +1311,11 @@
        },
        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json"
      }
+    },
+    "runtimes": {
+      "linux-x64": {
+        "#import": []
+      }
    }
-  },
-  "logs": [
-    {
-      "code": "NU1900",
-      "level": "Warning",
-      "warningLevel": 1,
-      "message": "获取包漏洞数据时出错: 无法加载源 https://api.nuget.org/v3/index.json 的服务索引。"
-    }
-  ]
+  }
 }
--- 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": "4vl29d1p6Sg=",
+  "dgSpecHash": "cmFKJWs0E5Q=",
  "success": true,
  "projectFilePath": "C:\\Users\\Administrator\\Desktop\\xwcode\\Server\\YD_XinWei.Commons\\YD_XinWei.Commons.csproj",
  "expectedPackageFiles": [
@ -28,12 +28,5 @@
    "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.1\\system.runtime.compilerservices.unsafe.4.5.1.nupkg.sha512",
    "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512"
  ],
-  "logs": [
-    {
-      "code": "NU1900",
-      "level": "Warning",
-      "warningLevel": 1,
-      "message": "获取包漏洞数据时出错: 无法加载源 https://api.nuget.org/v3/index.json 的服务索引。"
-    }
-  ]
+  "logs": []
 }
--- a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
  <PropertyGroup>
    <_PublishTargetUrl>C:\Users\Administrator\Desktop\web</_PublishTargetUrl>
-    <History>True|2025-03-04T09:35:37.1204893Z||;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-03-06T02:00:58.4898730Z||;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>
--- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs
+++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
@ -274,7 +274,7 @@ namespace YD_XinWei.Api.Services.Impl
                            Score = item.Score,
                            Max = item.MaxValue,
                            Min = item.MinValue
-                        }).ToList()
+                        }).OrderByDescending(x=>x.Min).ToList()
                    };

                    scoreRuleDto.Pluses = new List<ScoreRulePlusDto>
@ -803,13 +803,15 @@ namespace YD_XinWei.Api.Services.Impl

            var trainIds = trainList.Select(t => t.Id).ToList();

+            var today = DateTime.UtcNow.Date;
            var (startDate, endDate) = dto.Times switch
            {
-                "1" => (DateTime.UtcNow.AddDays(-7), DateTime.UtcNow), // 本周
-                "2" => (DateTime.UtcNow.AddMonths(-1), DateTime.UtcNow), // 本月
-                "3" => (new DateTime(DateTime.UtcNow.Year, 9, 1), DateTime.UtcNow), // 本学期
+                "1" => (today.AddDays(-(int)today.DayOfWeek + 1), today.AddDays(7 - (int)today.DayOfWeek)), // 本周（从周一到周日）
+                "2" => (new DateTime(today.Year, today.Month, 1), new DateTime(today.Year, today.Month, 1).AddMonths(1).AddDays(-1)), // 本月（从1号到最后一天）
+                "3" => (new DateTime(today.Year, 9, 1), new DateTime(today.Year, 9, 1).AddMonths(6).AddDays(-1)), // 本学期（9月1日到次年2月最后一天）
                _ => (DateTime.MinValue, DateTime.MaxValue)
            };
+
            // 先从数据库查询基本数据（不带时间过滤）
            var rawResults = await _sportsContext.XW_TrainStudents
                .Where(x => trainIds.Contains(x.XW_SportsTestDataId) && x.GradeId == dto.GradeId)
--- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe
+++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe
--- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb
+++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb
--- a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
+++ b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
--- 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+31abd812e401009acc58430cfab4fbfbbe0966bf")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
 [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- 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 @@
-72d638bd8da90b3d8bc011b2e1ead10d468e1350464a113d8190721066c27831
+57e0bf9ea8468ac4f7c3fd9737bb7b131c7ead35c0a8892a38514c98655ba4b9
--- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb
+++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb
--- 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\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=31abd812e401009acc58430cfab4fbfbbe0966bf&path=/*"}}
+{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=109d7c5045baf6bc633f73fc42556ea8ad66220d&path=/*"}}
--- a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
+++ b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/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+31abd812e401009acc58430cfab4fbfbbe0966bf")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+109d7c5045baf6bc633f73fc42556ea8ad66220d")]
 [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
@ -1 +1 @@
-72d638bd8da90b3d8bc011b2e1ead10d468e1350464a113d8190721066c27831
+57e0bf9ea8468ac4f7c3fd9737bb7b131c7ead35c0a8892a38514c98655ba4b9
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
@ -1 +1 @@
-{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=31abd812e401009acc58430cfab4fbfbbe0966bf&path=/*"}}
+{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=109d7c5045baf6bc633f73fc42556ea8ad66220d&path=/*"}}
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll
--- 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
--- 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