Commit ac374d14 authored by 任婷婷's avatar 任婷婷

.

parent 9e6ebf64
...@@ -30,8 +30,7 @@ def make_dict_from_pair(x): ...@@ -30,8 +30,7 @@ def make_dict_from_pair(x):
def update_tag3_user_portrait(cl_id): def update_tag3_user_portrait(cl_id):
user_df = get_tag3_user_log(cl_id) user_df = get_tag3_user_log(cl_id)
print('*'*100) print('*'*100)
print('cl_id',cl_id) print('tag3_user_log cl_id',cl_id)
print('tag3_user_log')
print(user_df) print(user_df)
print('-'*100) print('-'*100)
if not user_df.empty: if not user_df.empty:
......
...@@ -462,43 +462,44 @@ def user_portrait_action_statistic(cl_id): ...@@ -462,43 +462,44 @@ def user_portrait_action_statistic(cl_id):
# try: # try:
ud_dict = {} ud_dict = {}
user_df = get_user_portrait_log(cl_id) user_df = get_user_portrait_log(cl_id)
for ud in user_df: print('-'*100)
ud2_list = ud[2].split(",") print('cl_id',cl_id)
ud3_list = ud[3].split(",") print('user_df')
ud4_list = ud[4].split(",") print(user_df)
ud5_list = ud[5].split(",")
ud6_list = ud[6].split(",") if user_df:
ud7_list = ud[7].split(",") for ud in user_df:
ud8_list = ud[8].split(",") print('ud[0]',ud[0])
print('-' * 100)
if ud[0] in ud_dict.keys(): ud2_list = ud[2].split(",")
if ud[1] in ud_dict[ud[0]].keys(): ud3_list = ud[3].split(",")
ud_dict[ud[0]][ud[1]]["first_solutions"].extend(ud2_list) ud4_list = ud[4].split(",")
ud_dict[ud[0]][ud[1]]["second_solutions"].extend(ud3_list) ud5_list = ud[5].split(",")
ud_dict[ud[0]][ud[1]]["first_demands"].extend(ud4_list) ud6_list = ud[6].split(",")
ud_dict[ud[0]][ud[1]]["second_demands"].extend(ud5_list) ud7_list = ud[7].split(",")
ud_dict[ud[0]][ud[1]]["first_positions"].extend(ud6_list) ud8_list = ud[8].split(",")
ud_dict[ud[0]][ud[1]]["second_positions"].extend(ud7_list)
ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list) if ud[0] in ud_dict.keys():
if ud[1] in ud_dict[ud[0]].keys():
ud_dict[ud[0]][ud[1]]["first_solutions"].extend(ud2_list)
ud_dict[ud[0]][ud[1]]["second_solutions"].extend(ud3_list)
ud_dict[ud[0]][ud[1]]["first_demands"].extend(ud4_list)
ud_dict[ud[0]][ud[1]]["second_demands"].extend(ud5_list)
ud_dict[ud[0]][ud[1]]["first_positions"].extend(ud6_list)
ud_dict[ud[0]][ud[1]]["second_positions"].extend(ud7_list)
ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list)
else:
ud_dict[ud[0]][ud[1]] = {}
ud_dict[ud[0]][ud[1]] = {"first_solutions": ud2_list, "second_solutions": ud3_list,
"first_demands": ud4_list, "second_demands": ud5_list,
"first_positions": ud6_list, "second_positions": ud7_list,
"projects": ud8_list}
else: else:
ud_dict[ud[0]][ud[1]] = {} ud_dict[ud[0]] = {}
ud_dict[ud[0]][ud[1]] = {"first_solutions": ud2_list, "second_solutions": ud3_list, ud_dict[ud[0]][ud[1]] = {"first_solutions": ud2_list,"second_solutions": ud3_list,
"first_demands": ud4_list, "second_demands": ud5_list, "first_demands": ud4_list,"second_demands": ud5_list,
"first_positions": ud6_list, "second_positions": ud7_list, "first_positions": ud6_list,"second_positions": ud7_list,
"projects": ud8_list} "projects": ud8_list}
# ud_dict[ud[0]][ud[1]]["first_solutions"] = ud2_list
# ud_dict[ud[0]][ud[1]]["second_solutions"] = ud3_list
# ud_dict[ud[0]][ud[1]]["first_demands"] = ud4_list
# ud_dict[ud[0]][ud[1]]["second_demands"] = ud5_list
# ud_dict[ud[0]][ud[1]]["first_positions"] = ud6_list
# ud_dict[ud[0]][ud[1]]["second_positions"] = ud7_list
# ud_dict[ud[0]][ud[1]]["projects"] = ud8_list
else:
ud_dict[ud[0]] = {}
ud_dict[ud[0]][ud[1]] = {"first_solutions": ud2_list,"second_solutions": ud3_list,
"first_demands": ud4_list,"second_demands": ud5_list,
"first_positions": ud6_list,"second_positions": ud7_list,
"projects": ud8_list}
return ud_dict return ud_dict
# except Exception as e: # except Exception as e:
......
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