fix minimum_eac filters in equipment service queries

main
MrWaradana 4 weeks ago
parent 6b1dd678e5
commit 7df44deb4d

@ -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) | (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 | 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())

Loading…
Cancel
Save