Commit 9b0146d7 authored by 任婷婷's avatar 任婷婷

.

parent d0277b06
...@@ -44,6 +44,7 @@ def user_portrait_action_statistic(cl_id): ...@@ -44,6 +44,7 @@ def user_portrait_action_statistic(cl_id):
ud8_list = ud[8].split(",") ud8_list = ud[8].split(",")
if ud[0] in ud_dict.keys(): 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]]["first_solutions"].extend(ud2_list)
ud_dict[ud[0]][ud[1]]["second_solutions"].extend(ud3_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]]["first_demands"].extend(ud4_list)
...@@ -51,6 +52,15 @@ def user_portrait_action_statistic(cl_id): ...@@ -51,6 +52,15 @@ def user_portrait_action_statistic(cl_id):
ud_dict[ud[0]][ud[1]]["first_positions"].extend(ud6_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]]["second_positions"].extend(ud7_list)
ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list) ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list)
else:
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: else:
ud_dict[ud[0]] = {} 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,
...@@ -94,7 +104,7 @@ if __name__ == '__main__': ...@@ -94,7 +104,7 @@ if __name__ == '__main__':
second_solutions = [] second_solutions = []
projects = [] projects = []
# cl_ids = [1, 3] cl_ids = [1, 3]
data = user_portrait_action_statistic(cl_ids) data = user_portrait_action_statistic(cl_ids)
for key, values in data.items(): for key, values in data.items():
......
...@@ -474,6 +474,7 @@ def user_portrait_action_statistic(cl_id): ...@@ -474,6 +474,7 @@ def user_portrait_action_statistic(cl_id):
ud8_list = ud[8].split(",") ud8_list = ud[8].split(",")
if ud[0] in ud_dict.keys(): 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]]["first_solutions"].extend(ud2_list)
ud_dict[ud[0]][ud[1]]["second_solutions"].extend(ud3_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]]["first_demands"].extend(ud4_list)
...@@ -481,6 +482,14 @@ def user_portrait_action_statistic(cl_id): ...@@ -481,6 +482,14 @@ def user_portrait_action_statistic(cl_id):
ud_dict[ud[0]][ud[1]]["first_positions"].extend(ud6_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]]["second_positions"].extend(ud7_list)
ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list) ud_dict[ud[0]][ud[1]]["projects"].extend(ud8_list)
else:
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: else:
ud_dict[ud[0]] = {} 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,
......
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