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

app/service/data_service_v2.py

@@ -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

@@ -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/utils/jinjia2html_v2.py

@@ -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)))