|
|
|
@ -394,7 +394,7 @@ async def get_top_10_economic_life(*, db_session: DbSession, common) -> list[Equ
|
|
|
|
).label("economic_life")
|
|
|
|
).label("economic_life")
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.filter(Equipment.minimum_eac_year != None)
|
|
|
|
.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)
|
|
|
|
# .filter((current_year - Equipment.minimum_eac_year) >= 0)
|
|
|
|
.order_by((current_year - Equipment.minimum_eac_year).desc())
|
|
|
|
.order_by((current_year - Equipment.minimum_eac_year).desc())
|
|
|
|
.order_by(func.abs(Equipment.minimum_eac).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")
|
|
|
|
).label("economic_life")
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.filter(Equipment.minimum_eac_year != None)
|
|
|
|
.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)
|
|
|
|
# .filter((current_year - Equipment.minimum_eac_year) >= 0)
|
|
|
|
.order_by((current_year - Equipment.minimum_eac_year).asc())
|
|
|
|
.order_by((current_year - Equipment.minimum_eac_year).asc())
|
|
|
|
.order_by(func.abs(Equipment.minimum_eac).desc())
|
|
|
|
.order_by(func.abs(Equipment.minimum_eac).desc())
|
|
|
|
|