Merge remote-tracking branch 'origin/dev' into dev

app/utils/jinjia2html_v2.py

@@ -42,8 +42,8 @@ class DataIntegrate:
         # 月度回报表格
         self.get_month_table_return()
 
-        # 渲染模版
-        self.render_data()
+        # # 渲染模版
+        # self.render_data()
 
     # 分组和计算个基点评以及新增基金等结果
     def get_group_result(self):

app/utils/timed_task.py

@@ -59,7 +59,8 @@ def call_month_report(ifauser_id, ifauser_name, customer_id, customer_name):
     print('开始制作IFA: {}, 客户: {}的基金月报'.format(ifauser_name, customer_name))
     start = time.time()
     try:
-        DataIntegrate(ifauser_id, customer_id, '{}_{}_.pdf'.format(ifauser_name, customer_name))
+        dt = DataIntegrate(ifauser_id, customer_id, '{}_{}_.pdf'.format(ifauser_name, customer_name))
+        dt.render_data()
         print('IFA: {}, 客户: {}的基金月报已经生成, 耗时{}秒'.format(ifauser_name, customer_name, time.time()-start))
     except OSError:
         print('IFA: {}, 客户: {}的基金月报已经生成，耗时{}秒'.format(ifauser_name, customer_name, time.time()-start))