daily查询修改分页
This commit is contained in:
@@ -41,8 +41,8 @@ class DailyDiffQueryRequest(BaseModel):
|
|||||||
check_time_end: Optional[date] = Field(None, description="检查时间结束")
|
check_time_end: Optional[date] = Field(None, description="检查时间结束")
|
||||||
linecode: Optional[str] = Field(None, description="线路编码")
|
linecode: Optional[str] = Field(None, description="线路编码")
|
||||||
linecodes: Optional[List[str]] = Field(None, description="线路编码列表")
|
linecodes: Optional[List[str]] = Field(None, description="线路编码列表")
|
||||||
page: int = Field(1, ge=1, description="页码")
|
page: Optional[int] = Field(None, ge=1, description="页码,不填则查全部")
|
||||||
page_size: int = Field(20, ge=1, le=1000, description="每页数量")
|
page_size: Optional[int] = Field(None, ge=1, le=1000, description="每页数量,不填则查全部")
|
||||||
|
|
||||||
class DailyDiffListResponse(BaseModel):
|
class DailyDiffListResponse(BaseModel):
|
||||||
"""查询列表响应"""
|
"""查询列表响应"""
|
||||||
|
|||||||
@@ -115,8 +115,8 @@ class DailyDiffService(BaseService[DailyDiff]):
|
|||||||
check_time_end: Optional[date] = None,
|
check_time_end: Optional[date] = None,
|
||||||
linecode: Optional[str] = None,
|
linecode: Optional[str] = None,
|
||||||
linecodes: Optional[List[str]] = None,
|
linecodes: Optional[List[str]] = None,
|
||||||
page: int = 1,
|
page: Optional[int] = None,
|
||||||
page_size: int = 20
|
page_size: Optional[int] = None
|
||||||
) -> Tuple[List[DailyDiff], int]:
|
) -> Tuple[List[DailyDiff], int]:
|
||||||
"""
|
"""
|
||||||
多条件查询
|
多条件查询
|
||||||
@@ -149,9 +149,12 @@ class DailyDiffService(BaseService[DailyDiff]):
|
|||||||
# 获取总数
|
# 获取总数
|
||||||
total = query.count()
|
total = query.count()
|
||||||
|
|
||||||
# 分页
|
# 分页(如果提供了分页参数)
|
||||||
offset = (page - 1) * page_size
|
if page is not None and page_size is not None:
|
||||||
data = query.order_by(DailyDiff.id.desc()).offset(offset).limit(page_size).all()
|
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
|
return data, total
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user