From 9af4766b3151658f5da655e7a74afacc192d5553 Mon Sep 17 00:00:00 2001 From: liyxie Date: Wed, 7 Jan 2026 11:47:01 +0800 Subject: [PATCH] =?UTF-8?q?daily=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/schemas/daily_diff.py | 4 ++-- app/services/daily_diff.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/schemas/daily_diff.py b/app/schemas/daily_diff.py index fa4a4ca..3610864 100644 --- a/app/schemas/daily_diff.py +++ b/app/schemas/daily_diff.py @@ -41,8 +41,8 @@ class DailyDiffQueryRequest(BaseModel): check_time_end: Optional[date] = Field(None, description="检查时间结束") linecode: Optional[str] = Field(None, description="线路编码") linecodes: Optional[List[str]] = Field(None, description="线路编码列表") - page: int = Field(1, ge=1, description="页码") - page_size: int = Field(20, ge=1, le=1000, description="每页数量") + page: Optional[int] = Field(None, ge=1, description="页码，不填则查全部") + page_size: Optional[int] = Field(None, ge=1, le=1000, description="每页数量，不填则查全部") class DailyDiffListResponse(BaseModel): """查询列表响应""" diff --git a/app/services/daily_diff.py b/app/services/daily_diff.py index d4eb8b3..727afc7 100644 --- a/app/services/daily_diff.py +++ b/app/services/daily_diff.py @@ -115,8 +115,8 @@ class DailyDiffService(BaseService[DailyDiff]): check_time_end: Optional[date] = None, linecode: Optional[str] = None, linecodes: Optional[List[str]] = None, - page: int = 1, - page_size: int = 20 + page: Optional[int] = None, + page_size: Optional[int] = None ) -> Tuple[List[DailyDiff], int]: """ 多条件查询 @@ -149,9 +149,12 @@ class DailyDiffService(BaseService[DailyDiff]): # 获取总数 total = query.count() - # 分页 - offset = (page - 1) * page_size - data = query.order_by(DailyDiff.id.desc()).offset(offset).limit(page_size).all() + # 分页（如果提供了分页参数） + if page is not None and page_size is not None: + offset = (page - 1) * page_size + data = query.order_by(DailyDiff.id.desc()).offset(offset).limit(page_size).all() + else: + data = query.order_by(DailyDiff.id.desc()).all() return data, total