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
0db204af
Commit
0db204af
authored
Dec 08, 2020
by
赵杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复月份数据不一致bug
parent
840e95b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
result_service_v2.py
app/service/result_service_v2.py
+2
-0
No files found.
app/service/result_service_v2.py
View file @
0db204af
...
...
@@ -280,6 +280,8 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
return_ratio_df
[
"date"
]
=
return_ratio_df
.
index
return_group
=
return_ratio_df
.
groupby
(
return_ratio_df
[
"date"
]
.
apply
(
year_month
))
month_last_return_ratio
=
return_group
.
last
()[
"cum_return_ratio"
]
month_sum
=
month_sum
[
month_sum
.
index
.
isin
(
month_last_return_ratio
.
index
.
values
)]
month_result
=
pd
.
DataFrame
({
"date"
:
month_sum
.
index
,
"profit"
:
month_sum
.
values
,
"ratio"
:
month_last_return_ratio
.
values
})
month_result
[
"datetime"
]
=
pd
.
to_datetime
(
month_result
[
"date"
])
month_result
.
sort_values
(
by
=
"datetime"
,
inplace
=
True
)
...
...
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