|
|
@@ -247,6 +247,17 @@ from ({sql}) a
|
|
|
li[3] = round(float(li[3]), 2)
|
|
|
return dict(zip(['amount', 'add', 'roi', 'mult'], li))
|
|
|
|
|
|
+ # total已经写错更改过于
|
|
|
+ def parse_total(key_str):
|
|
|
+ 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)
|
|
|
+ li[3] = round(float(li[3]), 2)
|
|
|
+ return dict(zip(['amount', 'roi', 'add', 'mult'], 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',
|
|
|
@@ -255,7 +266,7 @@ from ({sql}) a
|
|
|
'd39', 'd40', 'd41', 'd42', 'd43', 'd44', 'd45', 'd46', 'd47', 'd48', 'd49', 'd50', 'd51', 'd52',
|
|
|
'd53', 'd54', 'd55', 'd56', 'd57', 'd58', 'd59',
|
|
|
'd60', 'm3', 'm4', 'm5']:
|
|
|
- total_data[k] = parse(v) if v else {}
|
|
|
+ total_data[k] = parse_total(v) if v else {}
|
|
|
|
|
|
# print(data)
|
|
|
for i in data:
|
