CrazyIter_Bin 3 years ago
parent
commit
1820529149

+ 1 - 4
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -226,15 +226,11 @@ namespace TEAMModelOS.SDK.Models.Service
                             }
                         }
                     }
-                   
                 }
                 else {
                     save = false;
                     school_lesson_expire = Constant.school_lesson_expire;
-
-
                 }
-
                 if (!save && school_lesson_expire > 0)
                 {
                     // 1-时间戳,7-时间戳
@@ -355,6 +351,7 @@ namespace TEAMModelOS.SDK.Models.Service
                             }
                         }
                     }
+                    lessonRecord.save = 1;
                     lessonRecord.expire = -1;
                 }
             }

+ 15 - 0
TEAMModelOS/Controllers/Both/LessonRecordController.cs

@@ -902,6 +902,21 @@ namespace TEAMModelOS.Controllers
             {
                 dict.Add("<=.startTime", etime);
             }
+            if (request.TryGetProperty("conds", out JsonElement conds) && conds.ValueKind.Equals(JsonValueKind.Array)) {
+                List<LessonSettingCond> settingConds = conds.Deserialize<List<LessonSettingCond>>();
+                foreach (var item in settingConds)
+                {
+                    switch (item.type)
+                    {
+                        case ">=":
+                            dict.TryAdd($">=.{item.key}",item.val);
+                            break;
+                        case "<=":
+                            dict.TryAdd($"<=.{item.key}", item.val);
+                            break;
+                    }
+                }
+            }
             return dict;
         }
     }

+ 0 - 1
TEAMModelOS/Controllers/Teacher/FavoriteController.cs

@@ -96,7 +96,6 @@ namespace TEAMModelOS.Controllers
                             }
                         }
                        await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, tableName).ReplaceItemAsync<LessonRecord>(lessonRecord, request.id, new PartitionKey(request.fromCode));
-                       
                     } catch (CosmosException ) { 
                         
                     }