Commit f22c77dd authored by 赵杰's avatar 赵杰

月度回报字符串key

parent c57136a3
......@@ -353,8 +353,8 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
for i in range(now_year-start_year+1):
month_return_data_dict[start_year+i] = {j+1: {"profit": "-", "net_amount": "-"} for j in range(12)}
for d_index, d_row in month_sum.items():
cur_year = int(d_index[:4])
cur_month = int(d_index[5:])
cur_year = str(int(d_index[:4]))
cur_month = str(int(d_index[5:]))
cur_profit = round(d_row/10000.0, 2)
cur_net_amount = round(month_amount_sum.loc[d_index]/10000, 2)
month_return_data_dict[cur_year][cur_month]["profit"] = "%.2f"%cur_profit
......
......@@ -1215,40 +1215,40 @@
盈亏
</td>
<td>
{{value[1]["profit"]}}
{{value["1"]["profit"]}}
</td>
<td >
{{value[2]["profit"]}}
{{value["2"]["profit"]}}
</td>
<td>
{{value[3]["profit"]}}
{{value["3"]["profit"]}}
</td>
<td>
{{value[4]["profit"]}}
{{value["4"]["profit"]}}
</td>
<td>
{{value[5]["profit"]}}
{{value["5"]["profit"]}}
</td>
<td>
{{value[6]["profit"]}}
{{value["6"]["profit"]}}
</td>
<td>
{{value[7]["profit"]}}
{{value["7"]["profit"]}}
</td>
<td>
{{value[8]["profit"]}}
{{value["8"]["profit"]}}
</td>
<td>
{{value[9]["profit"]}}
{{value["9"]["profit"]}}
</td>
<td>
{{value[10]["profit"]}}
{{value["10"]["profit"]}}
</td>
<td>
{{value[11]["profit"]}}
{{value["11"]["profit"]}}
</td>
<td>
{{value[12]["profit"]}}
{{value["12"]["profit"]}}
</td>
</tr>
<tr>
......@@ -1256,40 +1256,40 @@
期末资产
</td>
<td>
{{value[1]["net_amount"]}}
{{value["1"]["net_amount"]}}
</td>
<td>
{{value[2]["net_amount"]}}
{{value["2"]["net_amount"]}}
</td>
<td>
{{value[3]["net_amount"]}}
{{value["3"]["net_amount"]}}
</td>
<td>
{{value[4]["net_amount"]}}
{{value["4"]["net_amount"]}}
</td>
<td>
{{value[5]["net_amount"]}}
{{value["5"]["net_amount"]}}
</td>
<td>
{{value[6]["net_amount"]}}
{{value["6"]["net_amount"]}}
</td>
<td>
{{value[7]["net_amount"]}}
{{value["7"]["net_amount"]}}
</td>
<td>
{{value[8]["net_amount"]}}
{{value["8"]["net_amount"]}}
</td>
<td>
{{value[9]["net_amount"]}}
{{value["9"]["net_amount"]}}
</td>
<td>
{{value[10]["net_amount"]}}
{{value["10"]["net_amount"]}}
</td>
<td>
{{value[11]["net_amount"]}}
{{value["11"]["net_amount"]}}
</td>
<td>
{{value[12]["net_amount"]}}
{{value["12"]["net_amount"]}}
</td>
</tr>
{%endfor%}
......
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