Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2402.21</Version>
-		<AssemblyVersion>5.2402.21.1</AssemblyVersion>
-		<FileVersion>5.2402.21.1</FileVersion>
+		<Version>5.2402.28</Version>
+		<AssemblyVersion>5.2402.28.1</AssemblyVersion>
+		<FileVersion>5.2402.28.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2402.21</Version>
-		<AssemblyVersion>5.2402.21.1</AssemblyVersion>
-		<FileVersion>5.2402.21.1</FileVersion>
+		<Version>5.2402.28</Version>
+		<AssemblyVersion>5.2402.28.1</AssemblyVersion>
+		<FileVersion>5.2402.28.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.2402.21</Version>
-    <AssemblyVersion>5.2402.21.1</AssemblyVersion>
-    <FileVersion>5.2402.21.1</FileVersion>
+    <Version>5.2402.28</Version>
+    <AssemblyVersion>5.2402.28.1</AssemblyVersion>
+    <FileVersion>5.2402.28.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 

TEAMModelOS/Controllers/School/ArtReviewController.cs

@@ -372,7 +372,7 @@ namespace TEAMModelOS.Controllers
                                     x.subjectScores,
                                     x.artId,
                                     results = x.results.Select(c => new {
-                                        attachments = artAttachments.Where(z=> z.studentId.Equals(x.studentId) && z.taskId.Equals(c.taskId)).ToList(),
+                                        attachments = artAttachments.Where(z=> z.studentId.Equals(x.studentId) && z.taskId.Equals(c.taskId)).ToList().FirstOrDefault(),
                                         c.files,
                                         c.name,
                                         c.quotaId,
@@ -384,7 +384,7 @@ namespace TEAMModelOS.Controllers
                                         c.taskId,
                                         c.taskName
                                     }),
-                                    attachments = artAttachments.Where(c => c.studentId.Equals(x.studentId)).ToList().FirstOrDefault(),
+                                    //attachments = artAttachments.Where(c => c.studentId.Equals(x.studentId)).ToList().FirstOrDefault(),
                                     //url = x.results.Where(c => c.taskId.Equals(taskId.GetString())).FirstOrDefault().quotaId.Equals("quota_22") ? zyUrl.Where(c => c.stuId.Equals(x.studentId)).FirstOrDefault().url : ""
                                 });
                                 return Ok(new { subjectScore, scores, results = works.OrderBy(z => z.studentId), status = 1, continuationToken });

TEAMModelOS/TEAMModelOS.csproj

@@ -75,11 +75,11 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2402.21</Version>
-    <AssemblyVersion>5.2402.21.1</AssemblyVersion>
-    <FileVersion>5.2402.21.1</FileVersion>
+    <Version>5.2402.28</Version>
+    <AssemblyVersion>5.2402.28.1</AssemblyVersion>
+    <FileVersion>5.2402.28.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2402.21.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2402.28.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2402.21.1"
+    "Version": "5.2402.28.1"
   },
   "Azure": {
 

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2402.21.1"
+    "Version": "5.2402.28.1"
   },
   "Azure": {
     "Storage": {