|
|
@@ -441,10 +441,11 @@ async def get_emergency_contact_list(
|
|
|
if type_parent not in type_parent_list2:
|
|
|
dict_data = get_dict_data_info(db, 'three_proofing', type_parent)
|
|
|
type_parent_list2.append(type_parent)
|
|
|
- type_parent_list.append({"type_parent_id": type_parent, "type_parent": dict_data.dict_label})
|
|
|
+ type_parent_list.append(dict_data.dict_label)
|
|
|
area_info = id_get_area_info(db, info.area_code)
|
|
|
user_info = user_id_get_user_info(db, info.create_by)
|
|
|
area_list = db_area.id_get_area_parent_list(db, info.area_code, [])
|
|
|
+ area_list = '/'.join([i['label'] for i in area_list])
|
|
|
if info.order_num == -1:
|
|
|
order_num = ''
|
|
|
else:
|
|
|
@@ -462,7 +463,7 @@ async def get_emergency_contact_list(
|
|
|
"办公电话": mpfun.dec_data(info.telephone),
|
|
|
"排序顺序": order_num,
|
|
|
"创建时间": info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
- "责任类型": type_parent_list
|
|
|
+ "责任类型": '、'.join(type_parent_list)
|
|
|
})
|
|
|
# 返回结果+
|
|
|
import pandas as pd
|
