libushang 7 месяцев назад
Родитель
Сommit
d849bf4111
2 измененных файлов с 43 добавлено и 2 удалено
  1. 1 0
      models/taskRegistration_base.py
  2. 42 2
      routers/api/taskRegistration/__init__.py

+ 1 - 0
models/taskRegistration_base.py

@@ -34,6 +34,7 @@ class TaskRegistration(Base):
     feeback_user = Column(String(150), default='', server_default='', comment='反馈人员')
     contact_phone = Column(String(150), default='', server_default='', comment='')
     complete_time = Column(DateTime, comment='完成时限')
+    executor = Column(String(150), default='', server_default='', comment='执行人')
     
     # 你可以添加更多的字段和关系,例如与用户模型的外键关系
     # user_id = Column(Integer, ForeignKey('users.id'))

+ 42 - 2
routers/api/taskRegistration/__init__.py

@@ -37,14 +37,54 @@ async def create_task(
             return Response(content="事件不存在", status_code=400)
         task_id = db_task.get_next_event_id(db)
 
-        del body['complete_time']
+        imgList = []
+        if 'imgList' in body:
+            imgList = body['imgList']
+            del body['imgList']
+        
+        fileList = []
+        if 'fileList' in body:
+            fileList = body['fileList']
+            del body['fileList']        
 
         task_base = TaskRegistration(
             **body,
-            task_id=task_id
+            task_id = task_id,
+            registrar_id = user_id
         )
         db.add(task_base)
         db.commit()
+        db.refresh(task_base)
+
+        for file in imgList:
+            file_name = file['name']
+            file_name_desc = file['url']
+            status = file['status']
+            new_file = TaskFile(
+                file_id=new_guid(),
+                foreign_key=task_base.id,
+                from_scenario='task_img',
+                file_name=file_name,
+                file_name_desc=file_name_desc,
+                status=status
+            )
+            db.add(new_file)
+            db.commit()
+
+        for file in fileList:
+            file_name = file['name']
+            file_name_desc = file['url']
+            status = file['status']
+            new_file = TaskFile(
+                file_id=new_guid(),
+                foreign_key=task_base.id,
+                from_scenario='task_file',
+                file_name=file_name,
+                file_name_desc=file_name_desc,
+                status=status
+            )
+            db.add(new_file)
+            db.commit()
 
         return {
             "code": 200,