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

app/config/default_template_params.py

@@ -47,7 +47,7 @@ hold_default_template = {
     'cover_title1': '资产',
     'cover_title2': '存续报告',
     'logo': template_folder + 'logo.png',
-    'brand_name': '小飞象',
+    'brand_name': '某某某',
     # 'logo_display': 'table-cell',
     # 'brand_name_display': 'table-cell',
     'logo_display': 'none',
@@ -97,7 +97,7 @@ diagnose_default_template = {
     'cover_title1': '资产',
     'cover_title2': '存续报告',
     'logo': template_folder + 'logo.png',
-    'brand_name': '小飞象',
+    'brand_name': '某某某',
     # 'logo_display': 'table-cell',
     # 'brand_name_display': 'table-cell',
     'logo_display': 'none',

app/service/report_service.py

@@ -189,11 +189,25 @@ def make_report(args):
     args['create_time'] = datetime.datetime.now()
     args['update_status'] = 1
 
-    args.pop('type')
     record_id = 0
     default_template = ''
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
         tamp_diagnose_session = tamp_diagnose_app.session
+        customer_name = ''
+        type_name = '持仓报告'
+        create_date = str(datetime.datetime.now().date())
+        sql = "select customer_name from customer_view where id = '{}'".format(customer_id)
+        res = tamp_diagnose_session.execute(sql)
+        res = res.fetchone()
+        if res:
+            customer_name = res[0]
+        if type == 1:
+            type_name = '持仓报告'
+        elif type == 2:
+            type_name = '诊断报告'
+        elif type == 3:
+            type_name = '周期报告'
+        args['name'] = customer_name + type_name + create_date
         report_record = None
         if type == 1:
             report_record = HoldReport(**args)