hhb 7 mēneši atpakaļ
vecāks
revīzija
6e64131c61

+ 1 - 1
TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -97,7 +97,7 @@ namespace TEAMModelOS.SDK.Models.Service
                         using var json = await JsonDocument.ParseAsync(response.Content);
                         using var json = await JsonDocument.ParseAsync(response.Content);
                         sc = json.ToObject<School>();
                         sc = json.ToObject<School>();
                     }*/
                     }*/
-                    StringBuilder stringBuilder = new($"select value(c) from c where c.startTime >= {stime} and c.startTime < {etime} and c.qamode <> 2 and c.progress = 'finish' and c.period.id = '{periodId}'");
+                    StringBuilder stringBuilder = new($"select value(c) from c where c.startTime >= {stime} and c.startTime < {etime} and c.progress = 'finish' and c.period.id = '{periodId}'");
                     if (examType.Any()) {
                     if (examType.Any()) {
                         stringBuilder.Append($" and c.examType.name in ({string.Join(",", examType.Select(o => $"'{o}'"))}) ");
                         stringBuilder.Append($" and c.examType.name in ({string.Join(",", examType.Select(o => $"'{o}'"))}) ");
                     }
                     }

+ 1 - 1
TEAMModelOS/Controllers/Common/ExamController.cs

@@ -445,7 +445,7 @@ namespace TEAMModelOS.Controllers
                 List<ExamInfo> exams =  new List<ExamInfo>();
                 List<ExamInfo> exams =  new List<ExamInfo>();
                 (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, clds, $"{code}");
                 (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, clds, $"{code}");
                     var queryExam = $"select c.id,c.name,c.code,c.period,c.papers,c.average,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,c.creatorId from c where c.period.id = '{periodId}' and ({classInfos}) " +
                     var queryExam = $"select c.id,c.name,c.code,c.period,c.papers,c.average,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,c.creatorId from c where c.period.id = '{periodId}' and ({classInfos}) " +
-                    $"and c.qamode <> 2 and c.progress = 'finish' and c.scope = 'school' and c.startTime > {semesterData.date.ToUnixTimeMilliseconds()} and c.startTime < {semesterData.nextSemester.ToUnixTimeMilliseconds()} ";
+                    $"and c.progress = 'finish' and c.scope = 'school' and c.startTime > {semesterData.date.ToUnixTimeMilliseconds()} and c.startTime < {semesterData.nextSemester.ToUnixTimeMilliseconds()} ";
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: queryExam, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{code}") }))
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIteratorSql(queryText: queryExam, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{code}") }))
                     {
                     {
                         using var json = await JsonDocument.ParseAsync(item.Content);
                         using var json = await JsonDocument.ParseAsync(item.Content);