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

1.优化因活动对应中文数据不存在而报错的问题

Browse Source 
2.新增保存的看板展示时显示已有修改的备注名进行展示，没有则按保存时的字段展示
This commit is contained in:
李伟 2022-01-25 09:50:18 +08:00
parent 188b1fc9cc
commit 9d253cc68c
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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':

44
api/api_v1/endpoints/report.py
View File

@ -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)