Skip to content

F
fund_report
Commit 2361ae46 authored by wang zhengwei's avatar wang zhengwei
Browse files
Options

Merge branch 'app' of http://47.100.44.39:10001/pengxiong/fund_report into app

parents 3fa83015 81e99219
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 123 deletions
app/service/data_service_v2.py
View file @ 2361ae46
......@@ -37,7 +37,7 @@ class UserCustomerDataAdaptor:
self.customer_id = customer_id
self.compare_index_id = index_id
p_end_date = pd.to_datetime(end_date).date()
p_end_date = datetime.date(year=p_end_date.year, month=p_end_date.month, day=1) - datetime.timedelta(days=1)
# p_end_date = datetime.date(year=p_end_date.year, month=p_end_date.month, day=1) - datetime.timedelta(days=1)
self.end_date = pd.to_datetime(str(p_end_date))
# self.end_date = pd.to_datetime("2020-12-11")
p_start_date = datetime.date(year=p_end_date.year, month=p_end_date.month, day=1)
......
app/service/result_service_v2.py
View file @ 2361ae46
......@@ -372,16 +372,16 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
fund_basic_info = {"fund_name": row["fund_name"], "confirm_nav": round(row["nav"],4)}
fund_basic_info["cur_nav"] = round(float(self.fund_nav_total[cur_fund_id].dropna().values[-1]), 4)
fund_basic_info["cur_cnav"] = round(float(self.fund_cnav_total[cur_fund_id].dropna().values[-1]), 4)
fund_basic_info["ret_1w"] = round(cur_fund_info_series["ret_1w"]*100, 2) if cur_fund_info_series["ret_1w"] is not None else "-" # 上周
fund_basic_info["ret_cum_1m"] = round(cur_fund_info_series["ret_cum_1m"]*100, 2) if cur_fund_info_series["ret_cum_1m"] is not None else "-" # 最近一个月
fund_basic_info["ret_cum_6m"] = round(cur_fund_info_series["ret_cum_6m"]*100, 2) if cur_fund_info_series["ret_cum_6m"] is not None else "-" # 最近半年
fund_basic_info["ret_cum_1y"] = round(cur_fund_info_series["ret_cum_1y"]*100, 2) if cur_fund_info_series["ret_cum_1y"] is not None else "-" # 最近一年
fund_basic_info["ret_cum_ytd"] = round(cur_fund_info_series["ret_cum_ytd"]*100, 2) if cur_fund_info_series["ret_cum_ytd"] is not None else "-" # 今年以来
fund_basic_info["ret_cum_incep"] = round(cur_fund_info_series["ret_cum_incep"]*100, 2) if cur_fund_info_series["ret_cum_incep"] is not None else "-" # 成立以来
fund_basic_info["ret_1w"] = str(round(cur_fund_info_series["ret_1w"]*100, 2)) + "%" if cur_fund_info_series["ret_1w"] is not None else "-" # 上周
fund_basic_info["ret_cum_1m"] = str(round(cur_fund_info_series["ret_cum_1m"]*100, 2)) + "%" if cur_fund_info_series["ret_cum_1m"] is not None else "-" # 最近一个月
fund_basic_info["ret_cum_6m"] = str(round(cur_fund_info_series["ret_cum_6m"]*100, 2)) + "%" if cur_fund_info_series["ret_cum_6m"] is not None else "-" # 最近半年
fund_basic_info["ret_cum_1y"] = str(round(cur_fund_info_series["ret_cum_1y"]*100, 2)) + "%" if cur_fund_info_series["ret_cum_1y"] is not None else "-" # 最近一年
fund_basic_info["ret_cum_ytd"] = str(round(cur_fund_info_series["ret_cum_ytd"]*100, 2)) + "%" if cur_fund_info_series["ret_cum_ytd"] is not None else "-" # 今年以来
fund_basic_info["ret_cum_incep"] = str(round(cur_fund_info_series["ret_cum_incep"]*100, 2)) + "%" if cur_fund_info_series["ret_cum_incep"] is not None else "-" # 成立以来
# 申购以来
confirm_date = pd.to_datetime(row["confirm_share_date"])
confirm_cnav = float(p_result_cnav_data.loc[confirm_date, cur_fund_id])
fund_basic_info["ret_after_confirm"] = round((fund_basic_info["cur_cnav"] - confirm_cnav)/confirm_cnav*100, 2)
fund_basic_info["ret_after_confirm"] = str(round((fund_basic_info["cur_cnav"] - confirm_cnav)/confirm_cnav*100, 2)) + "%"
# 分红
distribution_df = self.all_fund_distribution[cur_fund_id]
if distribution_df.empty:
......
app/templates/v2/monthReportV2.1.html
View file @ 2361ae46
......@@ -937,16 +937,16 @@
<div class="dcell">
<img src={{logo}} alt="" class="cover_logo">
</div>
<div class="dcell">
<div class="cover_line"></div>
</div>
<div class="dcell">
<div class="cover_text">
<!-- <div class="dcell">-->
<!-- <div class="cover_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="cover_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
</div>
<img src={{cover_back}} alt="" class="cover_back fr">
<img src={{sh}} alt="" class="cover_back fr">
<div class="cover_title dtable">
<div class="cover_people">
<span class="cover_pre">
......@@ -959,7 +959,7 @@
</span>
</div>
<img class="cover_img" src="./img/red-rect.png" >
<img class="cover_img" src={{red-rect}} >
<div class="cover_title_text dcell">
资产<br>
存续报告
......@@ -1019,14 +1019,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="box2_content">
......@@ -1068,13 +1068,6 @@
</td>
</tr>
<tr>
<td>
{%if (now_yield|float)>=0%}
成立以来累计收益率：<span class="red">{{now_yield}}%</span>
{%else%}
成立以来累计收益率：<span class="green">{{now_yield}}%</span>
{%endif%}
</td>
<td>
{%if (now_annualised_return|float)>=0%}
年化收益率：<span class="red">{{now_annualised_return}}%</span>
......@@ -1089,7 +1082,12 @@
最大回撤：<span class="green">{{now_withdrawal}}%</span>
{%endif%}
</td>
<td>
<td colspan="2">
{%if (now_yield|float)>=0%}
成立以来累计收益率：<span class="red">{{now_yield}}%</span>
{%else%}
成立以来累计收益率：<span class="green">{{now_yield}}%</span>
{%endif%}
</td>
</tr>
</table>
......@@ -1301,14 +1299,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -1526,14 +1524,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -1620,7 +1618,7 @@
<th rowspan="2">基金简称</th>
<th rowspan="2">申购净值</th>
<th colspan="2">最新净值({{latest_worth_day}})</th>
<th colspan="7">收益率(%)</th>
<th colspan="7">收益率</th>
<th rowspan="2">分红</th>
</tr>
<tr>
......@@ -1662,14 +1660,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="tss2">
......@@ -1696,14 +1694,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -1718,14 +1716,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
{% endif %}
......@@ -1777,14 +1775,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
{% endif %}
......@@ -1820,14 +1818,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -1916,14 +1914,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="par clearfix" cellpadding="38">
......@@ -2060,14 +2058,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -2083,14 +2081,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="self_item">
......@@ -2160,14 +2158,14 @@
<div class="dcell">
<img src={{logo}} alt="" class="page_logo">
</div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div>
<!-- <div class="dcell">-->
<!-- <div class="page_line"></div>-->
<!-- </div>-->
<!-- <div class="dcell">-->
<!-- <div class="page_text">-->
<!-- {{brand_name}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="box8_content">
......
app/utils/jinjia2html_v2.py
View file @ 2361ae46
......@@ -246,6 +246,8 @@ class DataIntegrate:
'logo': template_folder + '/v2/img/logo.png',
'scene': template_folder + '/v2/img/scene.png',
'team': template_folder + '/v2/img/default-user.png',
'red-rect': template_folder + '/v2/img/red-rect.png',
'sh': template_folder + '/v2/img/sh.png',
# 全局数据
'customer_name': self.customer_name,
'year_month': self.user_customer.month_start_date.strftime("%Y-%m"),
......@@ -326,6 +328,6 @@ class DataIntegrate:
if __name__ == '__main__':
start = time.time()
dt = DataIntegrate(ifa_id='USER_INFO15916072577875', customer_id='6716613804966817792')
dt = DataIntegrate(ifa_id='USER_INFO15916072577875', customer_id='USER_INFO15917853924996')
dt.render_data()
print('耗时{}秒'.format(round(time.time()-start, 2)))
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