Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -695,7 +695,7 @@ export default {
             attendTrue: "已出席",
             attendFalse: "未出席",
             attendType: "出席状态",
-            getCount: "计分",
+            getCount: "记分",
             intCount: "互动分",
             taskNum: "任务数",
             colctNum: "作品数",

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -695,7 +695,7 @@ export default {
             attendTrue: "已出席",
             attendFalse: "未出席",
             attendType: "出席狀態",
-            getCount: "計分",
+            getCount: "記分",
             intCount: "互動分",
             taskNum: "任務數",
             colctNum: "作品數",

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -429,7 +429,7 @@ namespace TEAMModelOS.Controllers
             {
                 if (!requert.TryGetProperty("code", out JsonElement code)) return BadRequest();
                 var client = _azureCosmos.GetCosmosClient();
-                var query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes, c.stuLists, c.sRate,c.lostStu,c.sStatus,c.qamode,c.school from c where (c.status<>404 or IS_DEFINED(c.status) = false)";
+                var query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes, c.stuLists, c.sRate,c.lostStu,c.sStatus,c.qamode,c.school from c where (c.status<>404 or IS_DEFINED(c.status) = false) order by c.createTime";
                 if (requert.TryGetProperty("classIds", out JsonElement classIds))
                 {
                     List<string> ids = classIds.ToObject<List<string>>();
@@ -447,7 +447,7 @@ namespace TEAMModelOS.Controllers
                         strs.Add($"array_contains(c.classes,'{ssr}')");
                     }
                     string ss = string.Join(" or ", strs);
-                    query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime, c.source,c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus,c.qamode,c.school from c where ({ss}) and (c.status<>404 or IS_DEFINED(c.status) = false)";
+                    query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime, c.source,c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus,c.qamode,c.school from c where ({ss}) and (c.status<>404 or IS_DEFINED(c.status) = false) order by c.createTime";
                 };
 
                 string continuationToken = string.Empty;