diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py index 56fcb08..d5b8317 100644 --- a/api/api_v1/endpoints/query.py +++ b/api/api_v1/endpoints/query.py @@ -1094,11 +1094,11 @@ async def scatter_model( 'p': list_p}} #resp['list'][dt] = {'总体': {'n': [labels_dict.get(i, 0) for i in labels], 'total': total, # 'p': [round(labels_dict.get(i, 0) * 100 / total, 2) for i in labels]}} - if where =="step_id" and event_type == "guide": - sql=f"""SELECT toDate(addHours({game}.event."#event_time", 8)) AS date, count(DISTINCT {game}.event."#account_id") AS values FROM {game}.event WHERE addHours({game}.event."#event_time", 8) >= '{start_date}' AND addHours({game}.event."#event_time", 8) <= '{end_date}' AND {game}.event."#event_name" = 'create_account' GROUP BY toDate(addHours({game}.event."#event_time", 8)) ORDER BY date""" - df = await ckdb.query_dataframe(sql) - for i in range(len(df)): - resp['list'][str(df['date'][i])]['总体']['total']=int(df['values'][i]) + if where =="step_id" and event_type == "guide": + sql=f"""SELECT toDate(addHours({game}.event."#event_time", 8)) AS date, count(DISTINCT {game}.event."#account_id") AS values FROM {game}.event WHERE addHours({game}.event."#event_time", 8) >= '{start_date}' AND addHours({game}.event."#event_time", 8) <= '{end_date}' AND {game}.event."#event_name" = 'create_account' GROUP BY toDate(addHours({game}.event."#event_time", 8)) ORDER BY date""" + df = await ckdb.query_dataframe(sql) + for i in range(len(df)): + resp['list'][str(df['date'][i])]['总体']['total']=int(df['values'][i])