Explorar o código

补充培训列表查询接口

baoyubo hai 1 ano
pai
achega
096e65d283
Modificáronse 1 ficheiros con 10 adicións e 8 borrados
  1. 10 8
      routers/api/emergencyPlans/__init__.py

+ 10 - 8
routers/api/emergencyPlans/__init__.py

@@ -249,7 +249,7 @@ async def get_emergency_plan_list(
                 "drillId": drill.drill_id,
                 "drillName": drill.drill_name,
                 "drillUnit": drill.organizing_unit,
-                "year": drill.planned_annual,
+                "year": "%s年"%drill.planned_annual,
                 "drillTime": drill.planned_time.strftime('%Y-%m-%d %H:%M:%S'),
                 "drillAddress": drill.drill_location,
                 "drillProject":drill.drillProject,
@@ -303,13 +303,15 @@ async def get_emergency_plan_list(
         # 将查询结果转换为列表形式的字典
         emergency_training_list = [
             {
-                "drillId": training.drill_id,
-                "drillName": training.drill_name,
-                "drillUnit": training.organizing_unit,
-                "year": training.planned_annual,
-                "drillTime": training.planned_time.strftime('%Y-%m-%d %H:%M:%S'),
-                "drillAddress": training.drill_location,
-                "drillProject":training.drillProject
+                "textId": training.training_id,
+                "theme": training.training_theme,
+                "unitName": training.training_unit,
+                "peopleNum": "%s人"%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'),
+                "address": training.training_location,
+                "Content":training.training_content
             }
             for training in emergency_training
         ]