修复复盘

crypto_monitor_gate/app.py

@@ -60,8 +60,10 @@ from history_window_lib import (
     PRESET_UTC_LAST7D,
     PRESET_UTC_TODAY,
     list_window_redirect_query,
+    normalize_bj_datetime_storage,
     resolve_list_window,
     resolve_window,
+    sql_list_time_field,
     utc_window_to_bj_sql_strings,
 )
 
@@ -5632,9 +5634,9 @@ def render_main_page(page="trade"):
             exchange_pnl_sync = sync_trade_records_from_exchange(conn) or {}
         except Exception as e:
             exchange_pnl_sync = {"ok": False, "reason": str(e)}
+    tr_ts = sql_list_time_field("closed_at", "created_at", "opened_at")
     raw_records = conn.execute(
-        "SELECT * FROM trade_records WHERE COALESCE(closed_at, created_at, opened_at) >= ? "
-        "AND COALESCE(closed_at, created_at, opened_at) <= ? ORDER BY id DESC LIMIT 1000",
+        f"SELECT * FROM trade_records WHERE {tr_ts} >= ? AND {tr_ts} <= ? ORDER BY id DESC LIMIT 1000",
         (start_bj, end_bj),
     ).fetchall()
     records = [to_effective_trade_dict(r) for r in raw_records]
@@ -6879,8 +6881,8 @@ def export_trade_records():
         "margin_capital,leverage,pnl_amount,hold_seconds,hold_minutes,planned_rr,actual_rr,risk_amount,"
         "opened_at,closed_at,result,miss_reason,entry_reason,reviewed_entry_reason,"
         "exchange_realized_pnl,exchange_opened_at,exchange_closed_at,created_at "
-        "FROM trade_records WHERE COALESCE(closed_at, created_at, opened_at) >= ? "
-        "AND COALESCE(closed_at, created_at, opened_at) <= ? ORDER BY id ASC",
+        f"FROM trade_records WHERE {sql_list_time_field('closed_at', 'created_at', 'opened_at')} >= ? "
+        f"AND {sql_list_time_field('closed_at', 'created_at', 'opened_at')} <= ? ORDER BY id ASC",
         (start_bj, end_bj),
     ).fetchall()
     conn.close()
@@ -7265,7 +7267,12 @@ def add_journal():
             new_trade_while_occupied, note, image)
            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""",
         (
-            entry_id, d.get("open_datetime"), d.get("close_datetime"), hold_duration, d.get("coin"), d.get("tf"),
+            entry_id,
+            normalize_bj_datetime_storage(d.get("open_datetime")),
+            normalize_bj_datetime_storage(d.get("close_datetime")),
+            hold_duration,
+            d.get("coin"),
+            d.get("tf"),
             d.get("pnl"), entry_reason_norm, exit_reason_stored, d.get("expect_rr"), real_rr_text,
             early_exit_raw, early_exit_reason_saved, early_exit_trigger, early_exit_note,
             None, None, None, mood_issues,
@@ -7287,9 +7294,9 @@ def api_journals():
     win = _list_window_from_request()
     start_bj, end_bj = utc_window_to_bj_sql_strings(win["start_utc"], win["end_utc"], APP_TZ)
     conn = get_db()
+    j_ts = sql_list_time_field("close_datetime", "created_at", "open_datetime")
     rows = conn.execute(
-        "SELECT * FROM journal_entries WHERE COALESCE(close_datetime, created_at, open_datetime) >= ? "
-        "AND COALESCE(close_datetime, created_at, open_datetime) <= ? ORDER BY created_at DESC LIMIT 500",
+        f"SELECT * FROM journal_entries WHERE {j_ts} >= ? AND {j_ts} <= ? ORDER BY created_at DESC LIMIT 500",
         (start_bj, end_bj),
     ).fetchall()
     conn.close()