|
@@ -142,7 +142,7 @@ async def get_dict_data_by_type(
|
|
|
|
|
|
# 计算分页
|
|
|
offset = (page - 1) * pageSize
|
|
|
- query = query.order_by(DutySchedule.update_time.desc())
|
|
|
+ query = query.order_by(DutySchedule.start_time.desc(),DutySchedule.end_time.desc(),DutySchedule.update_time.desc())
|
|
|
duty_data = query.offset(offset).limit(pageSize).all()
|
|
|
|
|
|
# 转换为字典
|