fix api bug response oh schedule

main
Cizz22 9 months ago
parent f9e4bccf7d
commit 3959059298

@ -11,8 +11,8 @@ class OverhaulSchedule(Base, DefaultMixin):
year = Column(Integer, nullable=False)
plan_duration = Column(Integer, nullable=True)
# planned_outage = Column(Integer, nullable=True)
# actual_outage = Column(Integer, nullable=True)
planned_outage = Column(Integer, nullable=True)
actual_shutdown = Column(Integer, nullable=True)
start = Column(DateTime, nullable=True)
finish = Column(DateTime, nullable=True)
# remark = Column(String, nullable=True)
remark = Column(String, nullable=True)

@ -15,12 +15,12 @@ class OverhaulScheduleBase(DefultBase):
class OverhaulScheduleCreate(OverhaulScheduleBase):
year: int
plan_duration: Optional[int] = None
planned_outage: Optional[int] = None
actual_outage: Optional[int] = None
plan_duration: Optional[int] = Field(None)
planned_outage: Optional[int] = Field(None)
actual_shutdown: Optional[int] = Field(None)
start: datetime
finish: datetime
remark: Optional[str]
remark: Optional[str] = Field(None)
class OverhaulScheduleUpdate(OverhaulScheduleBase):
@ -30,12 +30,12 @@ class OverhaulScheduleUpdate(OverhaulScheduleBase):
class OverhaulScheduleRead(OverhaulScheduleBase):
id: UUID
year: int
# plan_duration: Optional[int] = None
# planned_outage: Optional[int] = None
# actual_outage: Optional[int] = None
plan_duration: Optional[int]
planned_outage: Optional[int]
actual_shutdown: Optional[int]
start: datetime
finish: datetime
# remark: Optional[str]
remark: Optional[str]

@ -16,7 +16,7 @@ from .schema import OverhaulScheduleCreate
async def get_all(*, common):
"""Returns all documents."""
query = Select(OverhaulSchedule).order_by(OverhaulSchedule.created_at.desc())
query = Select(OverhaulSchedule).order_by(OverhaulSchedule.start.desc())
results = await search_filter_sort_paginate(model=query, **common)
return results

Loading…
Cancel
Save