From b3fe49684bd9999a66ba6992e2ec90bed2408e9f Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sat, 23 Dec 2023 19:51:35 +0800 Subject: [PATCH] fix bug --- app/api/endpoints/history.py | 2 +- app/db/models/transferhistory.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/api/endpoints/history.py b/app/api/endpoints/history.py index 18104ed9..63f64d07 100644 --- a/app/api/endpoints/history.py +++ b/app/api/endpoints/history.py @@ -61,7 +61,7 @@ def transfer_history(title: str = None, count=count, status=status) else: result = TransferHistory.list_by_page(db, page=page, count=count, status=status) - total = TransferHistory.count(db) + total = TransferHistory.count(db, status=status) return schemas.Response(success=True, data={ diff --git a/app/db/models/transferhistory.py b/app/db/models/transferhistory.py index 0b246a4a..4e6834a3 100644 --- a/app/db/models/transferhistory.py +++ b/app/db/models/transferhistory.py @@ -103,8 +103,11 @@ class TransferHistory(Base): @staticmethod @db_query - def count(db: Session): - return db.query(func.count(TransferHistory.id)).first()[0] + def count(db: Session, status: bool = None): + if status is not None: + return db.query(func.count(TransferHistory.id)).filter(TransferHistory.status == status).first()[0] + else: + return db.query(func.count(TransferHistory.id)).first()[0] @staticmethod @db_query