From 9d253cc68c2094ee2b2c678f04e832b52fcdf7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <250213850@qq.com> Date: Tue, 25 Jan 2022 09:50:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=9B=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=B8=AD=E6=96=87=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=80=8C=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=B1=95=E7=A4=BA=E6=97=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B7=B2=E6=9C=89=E4=BF=AE=E6=94=B9=E7=9A=84=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=90=8D=E8=BF=9B=E8=A1=8C=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=99=E6=8C=89=E4=BF=9D=E5=AD=98=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api_v1/endpoints/query.py | 16 +++++++++---- api/api_v1/endpoints/report.py | 44 ++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py index 97f4670..0c4be9e 100644 --- a/api/api_v1/endpoints/query.py +++ b/api/api_v1/endpoints/query.py @@ -226,8 +226,11 @@ async def event_model( proid_dict = await crud.proid_map.get_all_show_name(db, game) res_list = [] for i in q['date_range']: - name = proid_dict[i] - res_list.append(name) + try: + name = proid_dict[i] + res_list.append(name) + except: + pass q['proid_name'] = res_list # 将proid字段和金额money按对应关系组合成字典并算出对应的总额返回给前端 money_dict = await crud.proid_map.get_all_show_money(db, game) @@ -236,9 +239,12 @@ async def event_model( next = -1 for i in q['date_range']: next += 1 - mongey = money_dict[i] - add = number[next] * mongey - add_money.append(add) + try: + mongey = money_dict[i] + add = number[next] * mongey + add_money.append(add) + except: + pass q['proid_money'] = add_money # 首充金额分布 # if item['groupby'][0] == 'money' and analysis.events[0]['event_name'] == 'pay': diff --git a/api/api_v1/endpoints/report.py b/api/api_v1/endpoints/report.py index cddcfcb..4938414 100644 --- a/api/api_v1/endpoints/report.py +++ b/api/api_v1/endpoints/report.py @@ -97,6 +97,50 @@ async def read_report( if item['_id'] in added_ids: item['added'] = True item['show_config'] = added_ids[item['_id']] + #保存的看板按备注显示的数据显示 + if type(item['query']['events']) == list: + event_show_name = await crud.event_mana.get_all_show_name(db, game) + for i in item['query']['events']: + if 'event_name' in i: + if i['event_name'] in event_show_name: + if 'event_desc' in i : + event_name= i['event_name'] + i['event_desc']= event_show_name[event_name] + else: + event_name = i['event_name'] + i['eventDesc'] = event_show_name[event_name] + else: + if i['eventName'] in event_show_name: + if 'event_desc' in i : + event_name= i['eventName'] + i['event_desc']= event_show_name[event_name] + else: + event_name = i['eventName'] + i['eventDesc'] = event_show_name[event_name] +#放置争霸 + if type(item['query']['events']) == dict: + data_attr = await crud.data_attr.find_many(db, {'game': game}) + data_attr = {item['name']: item for item in data_attr} + item_dict=item['query']['events'] + for k,v in item_dict.items(): + if k == 'quotaDesc': + if item_dict['quotaDesc'] in data_attr: + item_dict['quotaDesc']=data_attr[item_dict['quotaDesc']]['show_name'] + + + + + + # for k,v in event_show_name.items(): + # if 'event_desc' in item['query']['events'][0]: + # event_desc = item['query']['events'][0]['event_desc'] + # if k == event_desc: + # item['query']['events'][0]['event_desc'] = event_show_name[event_desc] + # else: + # event_desc = item['query']['events'][0]['eventDesc'] + # if k == event_desc: + # item['query']['events'][0]['eventDesc'] = event_show_name[event_desc] + reports = sorted(reports, key=lambda x: x.get('show_config', {'sort': 999}).get('sort', 999) or 999) return schemas.Msg(code=0, msg='ok', data=reports)