|
|
@@ -442,7 +442,7 @@ async def get_emergency_drill_list(
|
|
|
|
|
|
# 计算总条目数
|
|
|
total_items = query.count()
|
|
|
-
|
|
|
+ query = query.order_by(EmergencyDrill.create_time.desc())
|
|
|
# 执行分页查询
|
|
|
emergency_drill = query.offset((page - 1) * pageSize).limit(pageSize).all() #
|
|
|
print(emergency_drill)
|
|
|
@@ -453,7 +453,7 @@ async def get_emergency_drill_list(
|
|
|
"drillId": drill.drill_id,
|
|
|
"drillName": drill.drill_name,
|
|
|
"drillUnit": drill.organizing_unit,
|
|
|
- "year": "%s年" % drill.planned_annual,
|
|
|
+ "year": drill.planned_annual,
|
|
|
"drillTime": drill.planned_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"drillAddress": drill.drill_location,
|
|
|
"drillProject": get_file_query_fun(from_scenario='emergencyPlans_drill_project', foreign_key=drill.drill_id,db=db),
|
|
|
@@ -502,7 +502,7 @@ async def get_emergency_drill(
|
|
|
"drillId": drill.drill_id,
|
|
|
"drillName": drill.drill_name,
|
|
|
"drillUnit": drill.organizing_unit,
|
|
|
- "year": "%s年" % drill.planned_annual,
|
|
|
+ "year": drill.planned_annual,
|
|
|
"drillTime": drill.planned_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"drillAddress": drill.drill_location,
|
|
|
"drillProject": get_file_query_fun(from_scenario='emergencyPlans_drill_project',foreign_key=drill.drill_id,db=db),
|
|
|
@@ -732,7 +732,7 @@ async def get_emergency_training_list(
|
|
|
|
|
|
# 计算总条目数
|
|
|
total_items = query.count()
|
|
|
-
|
|
|
+ query = query.order_by(EmergencyTrainingSession.start_time.desc())
|
|
|
# 执行分页查询
|
|
|
emergency_training = query.offset((page - 1) * pageSize).limit(pageSize).all() #
|
|
|
# print(emergency_drill)
|
|
|
@@ -742,7 +742,7 @@ async def get_emergency_training_list(
|
|
|
"trainingId": training.training_id,
|
|
|
"theme": training.training_theme,
|
|
|
"unitName": training.training_unit,
|
|
|
- "peopleNum": "%s人"%training.participant_count,
|
|
|
+ "peopleNum": training.participant_count,
|
|
|
"trainingWay":training.training_method,
|
|
|
"startTime":training.start_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"endTime": training.end_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
@@ -795,7 +795,7 @@ async def get_emergency_training(
|
|
|
"trainingId": training.training_id,
|
|
|
"theme": training.training_theme,
|
|
|
"unitName": training.training_unit,
|
|
|
- "peopleNum": "%s人"%training.participant_count,
|
|
|
+ "peopleNum": training.participant_count,
|
|
|
"trainingWay":training.training_method,
|
|
|
"startTime":training.start_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"endTime": training.end_time.strftime('%Y-%m-%d %H:%M:%S'),
|
