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

app/templates/v2/monthReportV2.html

@@ -44,6 +44,7 @@
 
     /* 封面 */
     .box0 {
+      display: {{box0}};
       position: relative;
       padding: 234px 0 184px 0;
     }
@@ -150,6 +151,7 @@
 
     /* 目录 */
     .box1 {
+      display: {{box1}};
       position: relative;
       padding: 150px 0 200px 36px;
     }
@@ -242,6 +244,9 @@
     }
 
     /* 投资总览 */
+    .box2{
+      display: {{box2}};
+    }
     .box2 .box2_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
@@ -421,6 +426,9 @@
     }
 
     /* 目标与业绩 */
+    .box3{
+      display: {{box3}};
+    }
     .box3 .box3_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
@@ -608,12 +616,18 @@
     }
 
     /* 业绩的明细 */
+    .box4{
+      display: {{box4}};
+    }
     .box4 .box4_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
     }
 
     /* 个基点评 */
+    .box5{
+      display: {{box5}};
+    }
     .box5 .box5_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
@@ -794,18 +808,27 @@
     }
 
     /* 优化组合建议 */
+    .box6{
+      display: {{box6}};
+    }
     .box6 .box6_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
     }
 
     /* 新增基金 */
+    .box7{
+      display: {{box7}};
+    }
     .box7 .box7_content {
       padding: 47px 34px 61px 34px;
       page-break-after:always;
     }
 
     /* 结尾 */
+    .box8{
+      display: {{box8}};
+    }
     .box8 .box8_content {
       padding: 60px 0 60px 0;
     }

app/utils/draw.py

@@ -74,9 +74,9 @@ def draw_month_return_chart(xlabels, product_list, cumulative):
                 ax = ax1.bar(loc, product_list[i]['data'], width, bottom=bottom, alpha=0.8)
         for a, b in zip(range(len(xlabels)), product_list[0]['data']):
             if b > 0:
-                ax1.text(a, b+0.2, '%.0f万' % b, ha='center', va='bottom', fontsize=fontsize)
+                ax1.text(a, b+0.1, '%.2f万' % b, ha='center', va='bottom', fontsize=fontsize)
             elif b < 0:
-                ax1.text(a, b-0.5, '%.0f万' % b, ha='center', va='top', fontsize=fontsize)
+                ax1.text(a, b-0.1, '%.2f万' % b, ha='center', va='top', fontsize=fontsize)
         prod_legend.append(ax[0])
     ax1.legend(prod_legend, [prod['name'] for prod in product_list], loc='upper left', fontsize=fontsize)
 

app/utils/jinjia2html.py

@@ -172,6 +172,24 @@ class DataIntegrate:
     def render_data(self):
         # 全部数据
         data = {
+                # 封面 值为None不不显示，为block显示
+                'box0': 'block',
+                # 目录
+                'box1': 'block',
+                # 投资总览
+                'box2': 'block',
+                # 目标与业绩
+                'box3': 'block',
+                # 业绩的明细
+                'box4': 'block',
+                # 个基点评
+                'box5': 'block',
+                # 优化组合建议
+                'box6': 'block',
+                # 新增基金
+                'box7': 'block',
+                # 结尾
+                'box8': 'block',
                 'cover_back': template_folder + '/v2/img/cover-back.png',
                 'logo': template_folder + '/v2/img/logo.png',
                 'scene': template_folder + '/v2/img/scene/png',

app/utils/timed_task.py

@@ -51,8 +51,7 @@ with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_order_engine) as tam
     
     tamp_order_session = tamp_order.session
     # for ifauser in ifausers:
-    for ifauser in ifausers[:5]:
-    
+    for ifauser in ifausers[1000:2000]:
         # 获取某个 ifa 的所有 customer
         customers = tamp_order_session.query(Ifa_Customer).\
                         filter_by(ifa_id = ifauser.id).all()