no message

common/db/db_task.py

@@ -18,4 +18,46 @@ def get_next_event_id(db: Session):
         ).scalar()
 
         if it_exists == False:
-            return taskId
+            return taskId
+        
+
+
+def get_image_file_list(db: Session, task_id: str):
+    row = db.query(TaskRegistration).filter(TaskRegistration.task_id == task_id).first()
+    if row is None:
+        return []
+
+    task_id = row.task_id
+    file_query = db.query(TaskFile)
+    file_query = file_query.filter(TaskFile.del_flag != '2')
+    file_query = file_query.filter(TaskFile.from_scenario == 'task_img')
+    file_query = file_query.filter(TaskFile.foreign_key == str(row.id))
+    files = file_query.all()
+    result = [{
+        "uid": file.file_id,
+        "status": file.status,
+        "name": file.file_name_desc,
+        "url":  file.file_name
+    } for file in files]
+    return result
+
+
+
+def get_task_file_list(db: Session, task_id: str):
+    row = db.query(TaskRegistration).filter(TaskRegistration.task_id == task_id).first()
+    if row is None:
+        return []
+
+    task_id = row.task_id
+    file_query = db.query(TaskFile)
+    file_query = file_query.filter(TaskFile.del_flag != '2')
+    file_query = file_query.filter(TaskFile.from_scenario == 'task_file')
+    file_query = file_query.filter(TaskFile.foreign_key == str(row.id))
+    files = file_query.all()
+    result = [{
+        "uid": file.file_id,
+        "status": file.status,
+        "name": file.file_name_desc,
+        "url":  file.file_name
+    } for file in files]
+    return result

routers/api/taskRegistration/__init__.py

@@ -57,8 +57,8 @@ async def create_task(
         db.refresh(task_base)
 
         for file in imgList:
-            file_name = file['name']
-            file_name_desc = file['url']
+            file_name = file['url']
+            file_name_desc = file['name']
             status = file['status']
             new_file = TaskFile(
                 file_id=new_guid(),
@@ -72,8 +72,8 @@ async def create_task(
             db.commit()
 
         for file in fileList:
-            file_name = file['name']
-            file_name_desc = file['url']
+            file_name = file['url']
+            file_name_desc = file['name']
             status = file['status']
             new_file = TaskFile(
                 file_id=new_guid(),
@@ -162,6 +162,9 @@ async def select_tasks(
         for row in rows:
             info = get_model_dict(row)
             info['expire_time'] = get_date_str(info['expire_time'])
+            info['imgList'] = db_task.get_image_file_list(db, info['task_id'])
+            info['fileList'] = db_task.get_task_file_list(db, info['task_id'])
+            
             data.append(info)
 
         return {
@@ -231,8 +234,8 @@ async def update_task_status(
 
         if attachList is not None:
             for file in attachList:
-                file_name = file['name']
-                file_name_desc = file['url']
+                file_name = file['url']
+                file_name_desc = file['name']
                 status = file['status']
                 new_file = TaskFile(
                     file_id=new_guid(),