Commit 5ef5130d authored by lvshibao's avatar lvshibao

check页面修改

parent b9826e77
...@@ -274,6 +274,14 @@ class DataApi(viewsets.ViewSet): ...@@ -274,6 +274,14 @@ class DataApi(viewsets.ViewSet):
agent_names = get_agent_name(city_id, country_id, team_id, agent_name) agent_names = get_agent_name(city_id, country_id, team_id, agent_name)
if len(agent_names) > 0:
seat_code_name_lists = Seat.objects.filter(code__in=agent_names).values('code', 'name')
else:
seat_code_name_lists = Seat.objects.filter().values('code', 'name')
seat_code_name_dict = dict()
for seat_code_name in seat_code_name_lists:
seat_code_name_dict[seat_code_name['code']] = seat_code_name['name']
return_data = [] return_data = []
for k, v in task_dict.items(): for k, v in task_dict.items():
table_name = TABLE_PRE + k table_name = TABLE_PRE + k
...@@ -296,7 +304,9 @@ class DataApi(viewsets.ViewSet): ...@@ -296,7 +304,9 @@ class DataApi(viewsets.ViewSet):
remain = int(close - start) remain = int(close - start)
f_name = extra['filename'] if extra and 'filename' in extra.keys() else '' f_name = extra['filename'] if extra and 'filename' in extra.keys() else ''
detail = {'id': check['id'], 'sessionId': check['sessionId'], 'createdAt': check['createdAt'], detail = {'id': check['id'], 'sessionId': check['sessionId'], 'createdAt': check['createdAt'],
'area': t_name.split('_')[0], 'agentName': check['agentName'], 'filename': f_name, 'area': t_name.split('_')[0],
'seatName': seat_code_name_dict.get(check['agentName'], check['agentName']),
'agentName': check['agentName'], 'filename': f_name,
'remainTime': remain, 'sessionCollectionId': k, 'taskId': check['taskId']} 'remainTime': remain, 'sessionCollectionId': k, 'taskId': check['taskId']}
rule_detail = {'fwyy': 15, 'kcb': 5, 'jsy': 3, 'fwtd': 5, 'yssb': 5, 'jysb': 5, 'yycl': 10, rule_detail = {'fwyy': 15, 'kcb': 5, 'jsy': 3, 'fwtd': 5, 'yssb': 5, 'jysb': 5, 'yycl': 10,
'ywcc': 10, 'yyjlz': 10, 'fwjs': 10, 'wtgbj': 2, 'cgjxxhs': 20, 'wgzlf': 100, 'mgc': 100} 'ywcc': 10, 'yyjlz': 10, 'fwjs': 10, 'wtgbj': 2, 'cgjxxhs': 20, 'wgzlf': 100, 'mgc': 100}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment