deving
This commit is contained in:
+4
-4
@@ -147,7 +147,7 @@ async def get_file_history(db_session: AsyncSession = Depends(get_db_session)):
|
|||||||
result = await db_session.execute(
|
result = await db_session.execute(
|
||||||
select(ProcessingTask, STPFile)
|
select(ProcessingTask, STPFile)
|
||||||
.join(STPFile, ProcessingTask.stp_file_id == STPFile.id)
|
.join(STPFile, ProcessingTask.stp_file_id == STPFile.id)
|
||||||
.order_by(ProcessingTask.created_at.desc())
|
.order_by(ProcessingTask.created_time.desc())
|
||||||
)
|
)
|
||||||
|
|
||||||
tasks = result.all()
|
tasks = result.all()
|
||||||
@@ -162,7 +162,7 @@ async def get_file_history(db_session: AsyncSession = Depends(get_db_session)):
|
|||||||
file_groups[filename].append({
|
file_groups[filename].append({
|
||||||
"task_id": task.task_id,
|
"task_id": task.task_id,
|
||||||
"filename": filename,
|
"filename": filename,
|
||||||
"upload_time": task.created_at.isoformat() if task.created_at else "",
|
"upload_time": task.created_time.isoformat() if task.created_time else "",
|
||||||
"status": task.status,
|
"status": task.status,
|
||||||
"file_size": stp_file.file_size
|
"file_size": stp_file.file_size
|
||||||
})
|
})
|
||||||
@@ -205,7 +205,7 @@ async def get_file_records(filename: str):
|
|||||||
select(ProcessingTask, STPFile)
|
select(ProcessingTask, STPFile)
|
||||||
.join(STPFile, ProcessingTask.stp_file_id == STPFile.id)
|
.join(STPFile, ProcessingTask.stp_file_id == STPFile.id)
|
||||||
.where(STPFile.original_filename == decoded_filename)
|
.where(STPFile.original_filename == decoded_filename)
|
||||||
.order_by(ProcessingTask.created_at.desc())
|
.order_by(ProcessingTask.created_time.desc())
|
||||||
)
|
)
|
||||||
|
|
||||||
tasks = result.all()
|
tasks = result.all()
|
||||||
@@ -217,7 +217,7 @@ async def get_file_records(filename: str):
|
|||||||
"task_id": task.task_id,
|
"task_id": task.task_id,
|
||||||
"filename": stp_file.original_filename,
|
"filename": stp_file.original_filename,
|
||||||
"file_size": stp_file.file_size,
|
"file_size": stp_file.file_size,
|
||||||
"upload_time": task.created_at.isoformat() if task.created_at else "",
|
"upload_time": task.created_time.isoformat() if task.created_time else "",
|
||||||
"status": task.status,
|
"status": task.status,
|
||||||
"completed_at": task.completed_at.isoformat() if task.completed_at else "",
|
"completed_at": task.completed_at.isoformat() if task.completed_at else "",
|
||||||
"geometry_data": task.geometry_data,
|
"geometry_data": task.geometry_data,
|
||||||
|
|||||||
Reference in New Issue
Block a user