获取模版数据

app/controller/template_manage.py

@@ -32,8 +32,8 @@ class TemplateManage(Resource):
 
     @login_require
     def get(self):
-        """获取默认模版数据."""
-        self.parser.add_argument('type', type=int, required=True, help='type不能为空')
+        """获取模版数据."""
+        self.parser.add_argument('id', type=int, required=True, help='type不能为空')
         args = self.parser.parse_args()
         args['ifa_id'] = g.ifa_id
         data = get_default_template(args)

app/service/template_manage_service.py

@@ -22,37 +22,26 @@ from app.utils.jinjia2html_v2 import DataIntegrate
 
 def get_default_template(args):
     """"""
-    type = args.get('type')
-    data = []
+    data = {}
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
         tamp_diagnose_session = tamp_diagnose_app.session
         res = tamp_diagnose_session.query(FundReportManange).filter(and_(
-            FundReportManange.ifa_id == args.get('ifa_id'),
-            FundReportManange.type == type,
+            FundReportManange.id == args.get('id'),
             FundReportManange.delete_tag == 0,
-            FundReportManange.default_template.isnot(None)
         )).first()
         if not res:
             return False
+        type = res.type
         default_template, default_data = None, None
+        if res.default_template:
+            default_template = res.default_template
+        elif res.custom_template:
+            default_template = res.custom_template
         if type == 1:
-            args['name'] = '持仓报告默认模版'
-            default_template = hold_default_template
             default_data = hold_default_data
         elif type == 2:
-            args['name'] = '诊断报告默认模版'
-            default_template = diagnose_default_template
             default_data = diagnose_default_data
-        if res.default_template:
-            data = {'id': res.id, 'template_data': {**json.loads(res.default_template), **default_data}}
-        else:
-            args['id'] = str(uuid.uuid4())
-            args['default_template'] = json.dumps(default_template)
-            args['create_by'] = args.get('ifa_id')
-            args['create_time'] = datetime.datetime.now()
-            new_template = FundReportManange(**args)
-            tamp_diagnose_session.add(new_template)
-            data = {**default_template, **default_data}
+        data = {**json.loads(default_template), **json.loads(default_data)}
         return data
 
 def add_template(args):
@@ -230,7 +219,7 @@ def set_default_template(args):
         ))
         if not res:
             return False
-        type = res.type
+        type = res.first().type
         tamp_diagnose_session.query(FundReportManange).filter(FundReportManange.type==type).update({
             'default': 0
         })