where (c.status<>404 or IS_DEFINED(c.status) = false ) and 条件、

TEAMModelOS.SDK/Models/Service/ActivityService.cs

@@ -23,7 +23,8 @@ namespace TEAMModelOS.SDK
         {
             try
             {
-                var query = $"SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c  where  c.pk='{type}' " +
+                var query = $"SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c  " +
+                    $"where (c.status<>404 or IS_DEFINED(c.status) = false ) and  c.pk='{type}' " +
                     $" and (( array_contains(c.classes,'{groupChange.listid}')) or ( array_contains(c.stuLists,'{groupChange.listid}'))or ( array_contains(c.tchLists,'{groupChange.listid}')))";
                 //$"and A1 in('{groupChange.listid}') ";
                 List<MQActivity> datas = new List<MQActivity>();
@@ -44,7 +45,7 @@ namespace TEAMModelOS.SDK
                     foreach (var techer in teachers)
                     {
                         var queryTech = $"SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c " +
-                            $" where c.school='{groupChange.school}'   and   c.pk='{type}'" +
+                            $" where (c.status<>404 or IS_DEFINED(c.status) = false ) and  c.school='{groupChange.school}'   and   c.pk='{type}'" +
                             $" and (( array_contains(c.classes,'{groupChange.listid}')) or ( array_contains(c.stuLists,'{groupChange.listid}')))";
                         //  $" and A1 in('{groupChange.listid}') ";
                         await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<MQActivity>(queryText: queryTech,

TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -299,7 +299,7 @@ namespace TEAMModelOS.Controllers.Core
         {
             List<ExamRcd> examRcds = new List<ExamRcd>();
             int i = 1;
-            StringBuilder sql = new StringBuilder($"SELECT  * FROM c  where  (c.progress='going' or c.progress='finish') and c.scope='{scope}' ");
+            StringBuilder sql = new StringBuilder($"SELECT  * FROM c  where (c.status<>404 or IS_DEFINED(c.status) = false ) and   (c.progress='going' or c.progress='finish') and c.scope='{scope}' ");
             if (!string.IsNullOrEmpty(school))
             {
                 sql.Append($"  and c.school='{school}' ");
@@ -489,7 +489,7 @@ namespace TEAMModelOS.Controllers.Core
         {
             ExamData examRcds = null;
     
-            StringBuilder sql = new StringBuilder($"SELECT  value(c) FROM c  join papers in c.papers where  c.owner='{owner}'  and papers.sheetNo='{sheetNo}' ");
+            StringBuilder sql = new StringBuilder($"SELECT  value(c) FROM c  join papers in c.papers where (c.status<>404 or IS_DEFINED(c.status) = false ) and   c.owner='{owner}'  and papers.sheetNo='{sheetNo}' ");
             if (!string.IsNullOrEmpty(school))
             {
                 sql.Append($"  and c.school='{school}' ");

TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -409,7 +409,7 @@ namespace TEAMModelOS.Controllers.Client
                     //進行中的活動數
                     int activityCount = 0;
                     List<string> examIdList = new List<string>();
-                    await foreach (var actitem in clientc.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT COUNT(1) AS count FROM c WHERE c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{id}") }))
+                    await foreach (var actitem in clientc.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT COUNT(1) AS count FROM c where (c.status<>404 or IS_DEFINED(c.status) = false ) and  c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{id}") }))
                     {
                         using var json = await JsonDocument.ParseAsync(actitem.ContentStream);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -420,7 +420,7 @@ namespace TEAMModelOS.Controllers.Client
                             }
                         }
                     }
-                    await foreach (var actitem in clientc.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT COUNT(1) AS count FROM c WHERE c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Homework-{id}") }))
+                    await foreach (var actitem in clientc.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT COUNT(1) AS count FROM c where (c.status<>404 or IS_DEFINED(c.status) = false ) and  c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Homework-{id}") }))
                     {
                         using var json = await JsonDocument.ParseAsync(actitem.ContentStream);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -313,7 +313,7 @@ namespace TEAMModelOS.Controllers.Client
                 List<object> exams = new List<object>();
                 //取得評測ID List (HiTeach只取source='1'(課中评量) && progress = 'going'(進行中))
                 List<string> examIdList = new List<string>();
-                await foreach (var exam in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT c.id FROM c WHERE c.source = '1' AND c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{id}") }))
+                await foreach (var exam in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT c.id FROM c where (c.status<>404 or IS_DEFINED(c.status) = false ) and  c.source = '1' AND c.progress = 'going'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Exam-{id}") }))
                 {
                     using var json = await JsonDocument.ParseAsync(exam.ContentStream);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -326,7 +326,7 @@ namespace TEAMModelOS.Controllers.Client
                 }
                 //取得有作答的評測班級
                 Dictionary<string, List<string>> examClassFinDic = new Dictionary<string, List<string>>();
-                await foreach (var exam in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT  c.examId, c.info.id as classId FROM c WHERE ARRAY_CONTAINS({JsonSerializer.Serialize(examIdList)}, c.examId) AND c.progress=true", requestOptions: new QueryRequestOptions() { }))
+                await foreach (var exam in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"SELECT  c.examId, c.info.id as classId FROM c where (c.status<>404 or IS_DEFINED(c.status) = false ) and  ARRAY_CONTAINS({JsonSerializer.Serialize(examIdList)}, c.examId) AND c.progress=true", requestOptions: new QueryRequestOptions() { }))
                 {
                     var jsonecr = await JsonDocument.ParseAsync(exam.ContentStream);
                     if (jsonecr.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)

TEAMModelOS/Controllers/Teacher/TeacherCommonController.cs

@@ -96,7 +96,7 @@ namespace TEAMModelOS.Controllers
                 int acount = 0;
                 if (!string.IsNullOrWhiteSpace(school) && classes.ToList().IsNotEmpty())
                 {
-                    string querySchool = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c {joinSqlClasses}   where   {pksql}    {classesSql}";
+                    string querySchool = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c {joinSqlClasses}   where   {pksql}    {classesSql}  and    (c.status<>404 or IS_DEFINED(c.status) = false )   ";
                     //查询数据归属学校的
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<MQActivity>(querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{school}") }))
                     {
@@ -115,7 +115,7 @@ namespace TEAMModelOS.Controllers
 
                 if (!string.IsNullOrWhiteSpace(school) && stulist.ToList().IsNotEmpty())
                 {
-                    string querySchool = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c {joinSqlStulist}   where   {pksql}    {stuListsSql}";
+                    string querySchool = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c {joinSqlStulist}   where   {pksql}    {stuListsSql} and   (c.status<>404 or IS_DEFINED(c.status) = false )   ";
                     //查询数据归属学校的
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<MQActivity>(querySchool, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{school}") }))
                     {
@@ -126,7 +126,7 @@ namespace TEAMModelOS.Controllers
                         acount += 1;
                     }
                 }
-                string queryTeacher = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime  FROM c   where   {pksql}  ";
+                string queryTeacher = $" SELECT distinct c.owner, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime  FROM c   where   {pksql} and   (c.status<>404 or IS_DEFINED(c.status) = false )    ";
                 //查询数据归属个人的
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<MQActivity>(queryTeacher, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"{type}-{id}") }))
                 {
@@ -291,7 +291,7 @@ namespace TEAMModelOS.Controllers
             if (!string.IsNullOrWhiteSpace(school) && classes.IsNotEmpty())
             {
                 //string querySchool = $" SELECT distinct  value c   FROM c {joinSqlClasses} {joinSqlSubjects}  where {stimesql}  {etimesql}  {progresssql}  {typesql}  {andSqlSubjects}  {tgSql}";
-                string querySchoolclss = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime,c.source,c.type   FROM c {joinSqlClasses}   where   {pksql}    {classesSql}";
+                string querySchoolclss = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime,c.source,c.type   FROM c {joinSqlClasses}   where   {pksql}    {classesSql}  and   (c.status<>404 or IS_DEFINED(c.status) = false )   ";
                 //查询数据归属学校的
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(querySchoolclss, continuationToken: continuationTokenSchool, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"{type}-{school}") }))
                 {
@@ -310,7 +310,7 @@ namespace TEAMModelOS.Controllers
                         }
                     }
                 }
-                string querySchoollist = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type  FROM c {joinSqlStulist}   where   {pksql}    {stuListsSql}";
+                string querySchoollist = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type  FROM c {joinSqlStulist}   where   {pksql}    {stuListsSql} and   (c.status<>404 or IS_DEFINED(c.status) = false )   ";
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(querySchoollist, continuationToken: continuationTokenSchool, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"{type}-{school}") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
@@ -340,7 +340,7 @@ namespace TEAMModelOS.Controllers
 
                 }
             }
-            string queryTeacher = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type FROM c   where   {pksql}  ";
+            string queryTeacher = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type FROM c   where   {pksql}  and   (c.status<>404 or IS_DEFINED(c.status) = false )     ";
             //查询数据归属学校的
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryTeacher, continuationToken: continuationTokenSchool, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"{type}-{id}") }))
             {