From 6b1dd678e551eff8161e1fb6520dd317b7a9c669 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Wed, 17 Dec 2025 10:35:20 +0700 Subject: [PATCH] fix top 10 added column query --- src/equipment/service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/equipment/service.py b/src/equipment/service.py index ab267ba..8dcb45e 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -394,7 +394,7 @@ async def get_top_10_economic_life(*, db_session: DbSession, common) -> list[Equ ).label("economic_life") ) .filter(Equipment.minimum_eac_year != None) - .filter(Equipment.minimum_eac != None or Equipment.minimum_eac != 0) + .filter((Equipment.minimum_eac != None) | (Equipment.minimum_eac != 0)) # .filter((current_year - Equipment.minimum_eac_year) >= 0) .order_by((current_year - Equipment.minimum_eac_year).desc()) .order_by(func.abs(Equipment.minimum_eac).desc()) @@ -426,7 +426,7 @@ async def get_top_10_replacement_priorities(*, db_session: DbSession, common) -> ).label("economic_life") ) .filter(Equipment.minimum_eac_year != None) - .filter(Equipment.minimum_eac != None or Equipment.minimum_eac != 0) + .filter(Equipment.minimum_eac != None | Equipment.minimum_eac != 0) # .filter((current_year - Equipment.minimum_eac_year) >= 0) .order_by((current_year - Equipment.minimum_eac_year).asc()) .order_by(func.abs(Equipment.minimum_eac).desc())