Commit 06a587a5 authored by wenwen.tang's avatar wenwen.tang 😕

update

parent 125f3467
...@@ -174,7 +174,7 @@ class DailyHoldReportor(RoboReportor): ...@@ -174,7 +174,7 @@ class DailyHoldReportor(RoboReportor):
result['rebalance_type'] = [portfolio['type'] for i in datum_ids] result['rebalance_type'] = [portfolio['type'] for i in datum_ids]
result['weight'] = [format(i, '.0%') for i in json.loads(portfolio['portfolio']).values()] result['weight'] = [format(i, '.0%') for i in json.loads(portfolio['portfolio']).values()]
result['asset_ids'] = datum_ids result['asset_ids'] = [datums.loc[int(i)]['ftTicker'] for i in datum_ids]
result['name'] = [datums.loc[int(i)]['chineseName'] for i in datum_ids] result['name'] = [datums.loc[int(i)]['chineseName'] for i in datum_ids]
result['lipper_id'] = [datums.loc[int(i)]['lipperKey'] for i in datum_ids] result['lipper_id'] = [datums.loc[int(i)]['lipperKey'] for i in datum_ids]
result['date'] = [max_date for i in datum_ids] result['date'] = [max_date for i in datum_ids]
...@@ -210,7 +210,7 @@ class DailySignalReportor(RoboReportor): ...@@ -210,7 +210,7 @@ class DailySignalReportor(RoboReportor):
result['rebalance_type'] = [portfolio['type'] for i in datum_ids] result['rebalance_type'] = [portfolio['type'] for i in datum_ids]
result['weight'] = [format(i, '.0%') for i in json.loads(portfolio['portfolio']).values()] result['weight'] = [format(i, '.0%') for i in json.loads(portfolio['portfolio']).values()]
result['asset_ids'] = datum_ids result['asset_ids'] = [datums.loc[int(i)]['ftTicker'] for i in datum_ids]
result['name'] = [datums.loc[int(i)]['chineseName'] for i in datum_ids] result['name'] = [datums.loc[int(i)]['chineseName'] for i in datum_ids]
result['lipper_id'] = [datums.loc[int(i)]['lipperKey'] for i in datum_ids] result['lipper_id'] = [datums.loc[int(i)]['lipperKey'] for i in datum_ids]
result['date'] = [max_date for i in datum_ids] result['date'] = [max_date for i in datum_ids]
......
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