fix5

app/service/report_service.py

@@ -14,7 +14,8 @@ import uuid
 from sqlalchemy import and_, or_
 # from sqlalchemy import union_all
 
-from app.api.engine import TAMP_SQL, tamp_diagnose_app_engine, template_folder, temp_img_save_folder, pdf_save_folder
+from app.api.engine import TAMP_SQL, tamp_diagnose_app_engine, template_folder, temp_img_save_folder, pdf_save_folder, \
+    pdf_folder
 from app.model.tamp_diagnose_app import HoldReport, HoldDiagnoseReport, PeriodicReport, Customer, ReportView, \
     FundReportManange
 from app.utils.jinjia2html_v2 import DataIntegrate
@@ -189,6 +190,7 @@ def make_report(args):
     args['create_time'] = datetime.datetime.now()
     args['update_status'] = 1
 
+    data = {}
     record_id = 0
     default_template = ''
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
@@ -264,9 +266,15 @@ def make_report(args):
                     'update_status': 2,
                     'update_time': datetime.datetime.now()
                 })
+                data = {"id": record_id, "file": pdf_folder + pdf_name, "customer_id": customer_id,
+                        "ifa_id": ifa_id, "update_status": res[0].update_status,
+                        "update_time": res[0].update_time.strftime("%Y-%m-%d %H:%M:%S")}
             else:
                 res.update({
                     'update_status': 0,
                     'update_time': datetime.datetime.now()
                 })
-    return {'record_id': record_id}
+                data = {"id": record_id, "file": '', "customer_id": customer_id,
+                        "ifa_id": ifa_id, "update_status": res[0].update_status,
+                        "update_time": res[0].update_time.strftime("%Y-%m-%d %H:%M:%S")}
+    return data
\ No newline at end of file