diff --git a/database.py b/database.py index 369c8da..5f484e9 100755 --- a/database.py +++ b/database.py @@ -1663,27 +1663,24 @@ def get_schedule_execution_logs(schedule_id, limit=10): with db_pool.get_db() as conn: cursor = conn.cursor() cursor.execute(''' - SELECT - id, - schedule_id, - user_id, - schedule_name, - execute_time as created_at, - total_accounts, - success_accounts as success_count, - failed_accounts as failed_count, - total_items, - total_attachments, - total_screenshots, - duration_seconds as duration, - status, - error_message - FROM schedule_execution_logs + SELECT * FROM schedule_execution_logs WHERE schedule_id = ? ORDER BY execute_time DESC LIMIT ? ''', (schedule_id, limit)) - return [dict(row) for row in cursor.fetchall()] + + # 将数据库字段映射到前端期望的字段名 + logs = [] + for row in cursor.fetchall(): + log = dict(row) + # 字段映射 + log['created_at'] = log.get('execute_time') + log['success_count'] = log.get('success_accounts', 0) + log['failed_count'] = log.get('failed_accounts', 0) + log['duration'] = log.get('duration_seconds', 0) + logs.append(log) + + return logs def get_user_all_schedule_logs(user_id, limit=50):