优化预案接口

routers/api/emergencyPlans/__init__.py

@@ -30,10 +30,9 @@ class PlanCreateForm(BaseModel):
     fileList : List[File]
 
 class PlanUpdateForm(BaseModel):
-    planId : str
+    planUid : str
     planName : str = None
     planType : int = None
-    # planTypeDesc : str
     publishDate: str = None
     organizingUnit : str = None
     document : str = None
@@ -309,7 +308,7 @@ async def update_emergency_plan(
     try:
         # 提取请求数据
         query = db.query(EmergencyPlan)
-        query = query.filter(EmergencyPlan.plan_id == form_data.planId)
+        query = query.filter(EmergencyPlan.plan_id == form_data.planUid)
         query = query.filter(EmergencyPlan.del_flag != '2')
         plan = query.first()
 
@@ -617,18 +616,18 @@ async def update_emergency_drill(
             drill.drill_lat=form_data.lat
         # 判断演练方案是否存在，存在即更新
         if len(form_data.drillProject)>0:
-            delete_file_fun(from_scenario='emergencyPlans_drill_project',foreign_key=drill.plan_id,db=db)
-            for file in form_data.fileList:
+            delete_file_fun(from_scenario='emergencyPlans_drill_project',foreign_key=drill.drill_id,db=db)
+            for file in form_data.drillProject:
                 create_file_fun(file=file,from_scenario='emergencyPlans_drill_project',foreign_key=drill.drill_id,db=db)
         # 判断演练视频是否存在，存在即更新
         if len(form_data.drillVideo) > 0:
-            delete_file_fun(from_scenario='emergencyPlans_drill_video', foreign_key=drill.plan_id, db=db)
-            for file in form_data.fileList:
+            delete_file_fun(from_scenario='emergencyPlans_drill_video', foreign_key=drill.drill_id, db=db)
+            for file in form_data.drillVideo:
                 create_file_fun(file=file, from_scenario='emergencyPlans_drill_video', foreign_key=drill.drill_id,db=db)
         # 判断演练图片是否存在，存在即更新
         if len(form_data.drillPicture) > 0:
-            delete_file_fun(from_scenario='emergencyPlans_drill_pic', foreign_key=drill.plan_id, db=db)
-            for file in form_data.fileList:
+            delete_file_fun(from_scenario='emergencyPlans_drill_pic', foreign_key=drill.drill_id, db=db)
+            for file in form_data.drillPicture:
                 create_file_fun(file=file, from_scenario='emergencyPlans_drill_pic', foreign_key=drill.drill_id,db=db)
         # 提交所有更新
         db.commit()
@@ -920,7 +919,7 @@ async def update_emergency_training(
 
 @router.delete('/training/delete')
 async def delete_emergency_training(
-        trainingUids: str,
+        trainingUids: list,
         db: Session = Depends(get_db)
 ):
     try: