Merge branch 'develop' into cdrd/develop-graduate

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -91,15 +91,23 @@ namespace TEAMModelOS.SDK.Models.Service
                 dict.Add("<=.startTime", now);
                 dict.Add(">=.startTime", dayB);
             }
+            //查询即将到期的且没有被清理的。
             if (request.TryGetProperty("expire", out JsonElement expire) && expire.ValueKind.Equals(JsonValueKind.True))
             {
                 dict.Add(">.expire", 0);
                 dict.Add("!=.status", 404);
             }
+            //查询已经清理的
             if (request.TryGetProperty("is404", out JsonElement is404) && is404.ValueKind.Equals(JsonValueKind.True))
             {
                 dict.Add("=.status", 404);
             }
+            //只查有效的
+            if (request.TryGetProperty("isOk", out JsonElement isOk) && is404.ValueKind.Equals(JsonValueKind.True))
+            {
+                dict.Add("<=.expire", 0);
+                dict.Add("!=.status", 404);
+            }
             if (request.TryGetProperty("month", out JsonElement month) && month.GetBoolean())
             {
                 //DateTime dateTimeA = Convert.ToDateTime(DateTimeOffset.UtcNow.ToString("D"));

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -220,7 +220,7 @@ namespace TEAMModelOS.Controllers.Client
                 //觸發IMEI更新消息
                 var stus = students.Select(x => x.id).ToList();
                 var imeimsg = new ServiceBusMessage(new { request.channel, userid = request.did, request.school, stus }.ToJsonString());
-                imeimsg.ApplicationProperties.Add("name", "imei");
+                imeimsg.ApplicationProperties.Add("name", "Imei");
                 sbm.Add(imeimsg);
 
                 //開課記錄保存