|
|
@@ -1040,20 +1040,23 @@ def get_pitcher_trend(pitcher, start=None, end=None, page=None, page_size=None,
|
|
|
data, total, total_data = getLimitSumData(db.dm, sql, sumSql, page, page_size)
|
|
|
print(data)
|
|
|
|
|
|
- def parse(key_str):
|
|
|
+ def parse(key_str, is_total=False):
|
|
|
if type(key_str) is not str:
|
|
|
key_str = key_str.decode('utf-8')
|
|
|
li = key_str.split(',')
|
|
|
li[0] = round(float(li[0]), 2)
|
|
|
li[1] = round(float(li[1]), 4)
|
|
|
li[2] = round(float(li[2]), 4)
|
|
|
- return dict(zip(['amount', 'add', 'roi'], li))
|
|
|
+ if is_total:
|
|
|
+ return dict(zip(['amount', 'roi', 'add'], li))
|
|
|
+ else:
|
|
|
+ return dict(zip(['amount', 'add', 'roi'], li))
|
|
|
|
|
|
for k, v in total_data.items():
|
|
|
if k in ['d1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd8', 'd9', 'd10',
|
|
|
'd11', 'd12', 'd13', 'd14', 'd15', 'd16', 'd17', 'd18', 'd19', 'd20', 'd21', 'd22', 'd23', 'd24',
|
|
|
'd25', 'd26', 'd27', 'd28', 'd29', 'd30']:
|
|
|
- total_data[k] = parse(v) if v else {}
|
|
|
+ total_data[k] = parse(v, is_total=True) if v else {}
|
|
|
|
|
|
for i in data:
|
|
|
for k, v in i.items():
|
