Commit 94dc2f78 authored by pengxiong's avatar pengxiong

保存模版数据

parent a83e81b1
...@@ -193,6 +193,7 @@ def make_report(args): ...@@ -193,6 +193,7 @@ def make_report(args):
data = {} data = {}
record_id = 0 record_id = 0
report_data = ''
default_template = '' default_template = ''
with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app: with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
tamp_diagnose_session = tamp_diagnose_app.session tamp_diagnose_session = tamp_diagnose_app.session
...@@ -235,9 +236,8 @@ def make_report(args): ...@@ -235,9 +236,8 @@ def make_report(args):
try: try:
dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name, type=type) dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name, type=type)
report_data = dt.get_template_data(default_template=default_template) report_data = dt.get_template_data(default_template=default_template)
report_data = json.dumps(report_data, cls=npEncoder, ensure_ascii=False).replace(template_folder, temp_img_save_folder) report_data = json.dumps(report_data, cls=npEncoder, ensure_ascii=False)
report_data = json.loads(report_data) dt.render_data(data=json.loads(report_data.replace(template_folder, temp_img_save_folder)))
dt.render_data(data=report_data)
except: except:
pass pass
with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app: with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
...@@ -264,6 +264,7 @@ def make_report(args): ...@@ -264,6 +264,7 @@ def make_report(args):
if os.path.exists(pdf_save_folder + pdf_name): if os.path.exists(pdf_save_folder + pdf_name):
res.update({ res.update({
'file': pdf_name, 'file': pdf_name,
'report_data': report_data,
'update_status': 2, 'update_status': 2,
'update_time': datetime.datetime.now() 'update_time': datetime.datetime.now()
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment