|
|
|
|
@ -80,7 +80,7 @@ async def create_param_and_data(*, db_session: DbSession, calculation_param_in:
|
|
|
|
|
|
|
|
|
|
async def get_calculation_result(db_session: DbSession, calculation_id: str):
|
|
|
|
|
calculation = await get_calculation_data_by_id(db_session=db_session, calculation_id=calculation_id)
|
|
|
|
|
reference = await get_by_ass if calculation.overhaul_reference_type == OverhaulReferenceType.ASSET else await get(db_session=db_session, scope_id=calculation.reference_id)
|
|
|
|
|
reference = await get_by_assetnum(db_session=db_session, assetnum=calculation.reference_id) if calculation.overhaul_reference_type == OverhaulReferenceType.ASSET else await get(db_session=db_session, scope_id=calculation.reference_id)
|
|
|
|
|
|
|
|
|
|
stmt = select(CalculationResult).filter(
|
|
|
|
|
CalculationResult.calculation_data_id == calculation_id).order_by(CalculationResult.day)
|
|
|
|
|
@ -98,9 +98,11 @@ async def get_calculation_result(db_session: DbSession, calculation_id: str):
|
|
|
|
|
|
|
|
|
|
return CalculationTimeConstrainsRead(
|
|
|
|
|
id=calculation.id,
|
|
|
|
|
reference=reference if isinstance(
|
|
|
|
|
reference, str) else reference.scope_name,
|
|
|
|
|
results=results.scalars().all(),
|
|
|
|
|
name=reference.scope_name if hasattr(
|
|
|
|
|
reference, "scope_name") else reference.master_equipment.name,
|
|
|
|
|
reference=reference.assetnum if hasattr(
|
|
|
|
|
reference, "assetnum") else reference.scope_name,
|
|
|
|
|
results=results,
|
|
|
|
|
optimumOh=optimumRes
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|