leguadmin/xbackend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

分布合计导出

Browse Source
This commit is contained in:
wuaho 2021-10-13 15:39:16 +08:00
parent 26f63b6f68
commit 4e3eca48a4
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/api_v1/endpoints/query.py
View File

@ -612,6 +612,9 @@ async def retention_model_export(request: Request,
analysis = res['analysis'] analysis = res['analysis']
groupby = res['groupby'] groupby = res['groupby']
quota_interval_arr = res['quota_interval_arr'] quota_interval_arr = res['quota_interval_arr']
# 兼容合计的
if res['time_particle'] == 'total':
df['date'] = '合计'
if analysis != 'number_of_days' and interval_type != 'discrete': if analysis != 'number_of_days' and interval_type != 'discrete':
max_v = int(df['values'].max()) max_v = int(df['values'].max())
min_v = int(df['values'].min()) min_v = int(df['values'].min())
@ -639,10 +642,17 @@ async def retention_model_export(request: Request,
right=False).value_counts() right=False).value_counts()
bins_s.sort_index(inplace=True) bins_s.sort_index(inplace=True)
total = int(bins_s.sum()) total = int(bins_s.sum())
resp['list'][key.strftime('%Y-%m-%d')] = dict() if res['time_particle'] == 'total':
resp['list'][key.strftime('%Y-%m-%d')]['总体'] = {'n': bins_s.to_list(), 'total': total, resp['list']['合计'] = dict()
'p': round(bins_s * 100 / total, 2).to_list(), resp['list']['合计']['总体'] = {'n': bins_s.to_list(), 'total': total,
'title': '总体'} 'p': round(bins_s * 100 / total, 2).to_list(),
'title': '总体'}
else:
resp['list'][key.strftime('%Y-%m-%d')] = dict()
resp['list'][key.strftime('%Y-%m-%d')]['总体'] = {'n': bins_s.to_list(), 'total': total,
'p': round(bins_s * 100 / total, 2).to_list(),
'title': '总体'}
# 分组的 # 分组的
if groupby: if groupby:
export_df = pd.DataFrame(columns=resp['label']) export_df = pd.DataFrame(columns=resp['label'])
@ -675,12 +685,14 @@ async def retention_model_export(request: Request,
'end_date': res['end_date'], 'end_date': res['end_date'],
'time_particle': res['time_particle'] 'time_particle': res['time_particle']
} }
total_dict = {}
labels = [str(i) for i in sorted(df['values'].unique())] labels = [str(i) for i in sorted(df['values'].unique())]
resp['label'] = labels resp['label'] = labels
for key, tmp_df in df.groupby(['date']): for key, tmp_df in df.groupby(['date']):
total = len(tmp_df) total = len(tmp_df)
dt = key.strftime('%Y-%m-%d') if res['time_particle'] == 'total':
dt = '合计'
else:
dt = key.strftime('%Y-%m-%d')
labels_dict = {} labels_dict = {}
for key2, tmp_df2 in tmp_df.groupby('values'): for key2, tmp_df2 in tmp_df.groupby('values'):
label = str(key2) label = str(key2)