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
7adeb860
Commit
7adeb860
authored
Feb 05, 2021
by
赵杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
内部订单只有一个的时候用简单收益替换组合
parent
2d09b31b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
result_service_v2.py
app/service/result_service_v2.py
+14
-1
No files found.
app/service/result_service_v2.py
View file @
7adeb860
...
@@ -204,7 +204,20 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
...
@@ -204,7 +204,20 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
correlation
=
self
.
old_correlation
(
df_
)
correlation
=
self
.
old_correlation
(
df_
)
folio_report_data
[
"correlation"
]
=
correlation
folio_report_data
[
"correlation"
]
=
correlation
self
.
group_result_data
[
folio
]
=
folio_report_data
self
.
group_result_data
[
folio
]
=
folio_report_data
folio_name
=
list
(
self
.
group_data
.
keys
())[
0
]
if
len
(
self
.
group_data
)
==
1
and
len
(
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
])
==
1
:
self
.
total_result_data
[
"cur_month_profit_ratio"
]
=
float
(
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"month_return_ratio"
])
/
100.0
self
.
total_result_data
[
"cumulative_return"
]
=
float
(
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"cum_profit_ratio"
])
/
100.0
+
1
self
.
total_result_data
[
"return_ratio_year"
]
=
float
(
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"return_ratio_year"
])
/
100.0
self
.
group_result_data
[
folio_name
][
"group_hoding_info_total"
][
"cur_month_profit_ratio"
]
=
\
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"month_return_ratio"
]
self
.
group_result_data
[
folio_name
][
"group_hoding_info_total"
][
"cumulative_return"
]
=
\
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"cum_profit_ratio"
]
self
.
group_result_data
[
folio_name
][
"group_hoding_info_total"
][
"return_ratio_year"
]
=
\
self
.
group_result_data
[
folio_name
][
"group_hoding_info"
][
0
][
"return_ratio_year"
]
return
self
.
group_result_data
return
self
.
group_result_data
# 综述数据
# 综述数据
...
...
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