|
@@ -38,6 +38,7 @@ class PlanCreateForm(BaseModel):
|
|
|
publishDate: str
|
|
|
organizingUnit : str
|
|
|
document : str
|
|
|
+ event_type: str
|
|
|
fileList : List[File]
|
|
|
|
|
|
class PlanUpdateForm(BaseModel):
|
|
@@ -47,6 +48,7 @@ class PlanUpdateForm(BaseModel):
|
|
|
publishDate: str = None
|
|
|
organizingUnit : str = None
|
|
|
document : str = None
|
|
|
+ event_type: str = None
|
|
|
fileList : List[File] = []
|
|
|
|
|
|
class DrillCreateForm(BaseModel):
|
|
@@ -199,7 +201,8 @@ async def get_emergency_plan_list(
|
|
|
"planType": plan.plan_type,
|
|
|
"organizingUnit": plan.organizing_unit,
|
|
|
"document": plan.document_number,
|
|
|
- "publishDate": plan.publish_date.strftime('%Y-%m-%d')
|
|
|
+ "publishDate": plan.publish_date.strftime('%Y-%m-%d'),
|
|
|
+ "event_type": plan.event_type
|
|
|
}
|
|
|
for plan in emergency_plans
|
|
|
]
|
|
@@ -246,7 +249,8 @@ async def get_emergency_plan(
|
|
|
"organizingUnit": emergency_plan.organizing_unit,
|
|
|
"document": emergency_plan.document_number,
|
|
|
"publishDate": emergency_plan.publish_date.strftime('%Y-%m-%d'),
|
|
|
- "fileList": get_file_query_fun(from_scenario='emergencyPlans_plan',foreign_key=emergency_plan.plan_id,db=db)
|
|
|
+ "fileList": get_file_query_fun(from_scenario='emergencyPlans_plan',foreign_key=emergency_plan.plan_id,db=db),
|
|
|
+ "event_type": emergency_plan.event_type
|
|
|
}
|
|
|
|
|
|
# 返回结果
|
|
@@ -279,6 +283,7 @@ async def create_emergency_plan(
|
|
|
publish_date = form_data.publishDate # 如果没有提供发布日期,则使用当前时间
|
|
|
organizing_unit = form_data.organizingUnit # 使用用户位置作为编制单位
|
|
|
document_number = form_data.document
|
|
|
+ event_type = form.event_type
|
|
|
|
|
|
# 创建新的预案记录
|
|
|
new_plan = EmergencyPlan(
|
|
@@ -289,6 +294,7 @@ async def create_emergency_plan(
|
|
|
publish_date=publish_date,
|
|
|
organizing_unit=organizing_unit,
|
|
|
document_number=document_number,
|
|
|
+ event_type=event_type,
|
|
|
create_by = user_id
|
|
|
)
|
|
|
|
|
@@ -344,6 +350,9 @@ async def update_emergency_plan(
|
|
|
|
|
|
if form_data.document:
|
|
|
plan.document_number = form_data.document
|
|
|
+
|
|
|
+ if form_data.event_type:
|
|
|
+ plan.event_type = form_data.event_type
|
|
|
|
|
|
if len(form_data.fileList)>0:
|
|
|
delete_file_fun(from_scenario='emergencyPlans_plan',foreign_key=plan.plan_id,db=db)
|