daily查询修改分页
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user