Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
F
fund_report
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
彭熊
fund_report
Commits
3bf46d55
Commit
3bf46d55
authored
Dec 07, 2020
by
赵杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除月度回报表格中 累积/月均
parent
89ba4f54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
result_service_v2.py
app/service/result_service_v2.py
+1
-1
monthReportV2.html
app/templates/v2/monthReportV2.html
+11
-9
No files found.
app/service/result_service_v2.py
View file @
3bf46d55
...
...
@@ -296,7 +296,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
now_year
=
datetime
.
datetime
.
now
()
.
year
month_return_data_dict
=
{}
for
i
in
range
(
now_year
-
start_year
+
1
):
month_return_data_dict
[
start_year
+
i
]
=
{
j
+
1
:
{
"profit"
:
0
,
"net_amount"
:
0
}
for
j
in
range
(
1
3
)}
month_return_data_dict
[
start_year
+
i
]
=
{
j
+
1
:
{
"profit"
:
0
,
"net_amount"
:
0
}
for
j
in
range
(
1
2
)}
for
d_index
,
d_row
in
month_sum
.
items
():
cur_year
=
int
(
d_index
[:
4
])
cur_month
=
int
(
d_index
[
5
:])
...
...
app/templates/v2/monthReportV2.html
View file @
3bf46d55
...
...
@@ -1119,9 +1119,9 @@
<th>
12月
</th>
<th
>
累计/月均
</th
>
<!-- <th>--
>
<!-- 累计/月均-->
<!-- </th>--
>
</tr>
{%for key, value in monthly_table_return.items() %}
<tr
class=
"yellow"
>
...
...
@@ -1167,9 +1167,9 @@
<td>
{{value[12]["profit"]}}
</td>
<td
>
{{value[13]["profit"]}}
</td
>
<!-- <td>--
>
<!-- {{value[13]["profit"]}}-->
<!-- </td>--
>
</tr>
<tr>
<td>
...
...
@@ -1211,9 +1211,11 @@
<td>
{{value[12]["net_amount"]}}
</td>
<td>
{{value[13]["net_amount"]}}
</td>
<!-- <td>-->
<!-- {{value[13]["net_amount"]}}-->
<!-- </td> <td>-->
<!-- {{value[13]["net_amount"]}}-->
<!-- </td>-->
</tr>
{%endfor%}
</table>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment