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
ea8be76d
Commit
ea8be76d
authored
Dec 26, 2020
by
赵杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新大周期数据重采样后的不一致
parent
eed7ba83
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
result_service_v2.py
app/service/result_service_v2.py
+8
-2
No files found.
app/service/result_service_v2.py
View file @
ea8be76d
...
...
@@ -107,6 +107,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
cur_profit_ratio
=
return_ratio_df
.
loc
[
self
.
month_start_date
:,
"cum_return_ratio"
]
.
values
if
len
(
last_profit_ratio
)
<=
0
:
cur_month_profit_ratio
=
cur_profit_ratio
[
-
1
]
-
1
else
:
if
len
(
cur_profit_ratio
)
<
1
:
cur_month_profit_ratio
=
0
else
:
cur_month_profit_ratio
=
(
cur_profit_ratio
[
-
1
]
-
last_profit_ratio
[
-
1
])
/
last_profit_ratio
[
-
1
]
folio_report_data
[
"cur_month_profit_ratio"
]
=
float
(
cur_month_profit_ratio
)
...
...
@@ -254,6 +257,9 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
cur_profit_ratio
=
return_ratio_df
.
loc
[
self
.
month_start_date
:,
"cum_return_ratio"
]
.
values
if
len
(
last_profit_ratio
)
<=
0
:
cur_month_profit_ratio
=
cur_profit_ratio
[
-
1
]
-
1
else
:
if
len
(
cur_profit_ratio
)
<
1
:
cur_month_profit_ratio
=
0
else
:
cur_month_profit_ratio
=
(
cur_profit_ratio
[
-
1
]
-
last_profit_ratio
[
-
1
])
/
last_profit_ratio
[
-
1
]
report_data
[
"cur_month_profit_ratio"
]
=
float
(
cur_month_profit_ratio
)
...
...
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