发布v2.0.0分支

backend/app/api/v1/params/system/notice_param.py

@@ -3,14 +3,19 @@
 from typing import Optional
 from fastapi import Query
 
+from app.core.validator import DateTimeStr
+
 class NoticeQueryParams:
     """公告通知查询参数"""
 
     def __init__(
             self,
             notice_title: Optional[str] = Query(None, description="公告标题"),
-            available: Optional[bool] = Query(None, description="是否可用"),
+            notice_type: Optional[str] = Query(None, description="公告类型"),
+            status: Optional[bool] = Query(None, description="是否可用"),
             creator: Optional[int] = Query(None, description="创建人"),
+            start_time: Optional[DateTimeStr] = Query(None, description="开始时间", example="2023-01-01 00:00:00"),
+            end_time: Optional[DateTimeStr] = Query(None, description="结束时间", example="2023-12-31 23:59:59"),
     ) -> None:
         super().__init__()
         
@@ -19,5 +24,12 @@ class NoticeQueryParams:
 
         # 精确查询字段
         self.creator_id = creator
-        self.available = available
+        self.status = status
+
+        # 时间范围查询
+        if start_time and end_time:
+            start_datetime = datetime.strptime(str(start_time), '%Y-%m-%d %H:%M:%S')
+            end_datetime = datetime.strptime(str(end_time), '%Y-%m-%d %H:%M:%S')
+            self.created_at = ("between", (start_datetime, end_datetime))
+