Commit c7589b3f authored by wang zhengwei's avatar wang zhengwei

修改生成持仓报告bug

parent e63acc59
...@@ -181,7 +181,7 @@ class AppReportHandlers(Resource): ...@@ -181,7 +181,7 @@ class AppReportHandlers(Resource):
def get(self): def get(self):
""".""" """."""
self.parser.add_argument('customer_id', type=str, required=True, help='customer_id不能为空') self.parser.add_argument('customer_id', type=str, required=True, help='customer_id不能为空')
self.parser.add_argument('time', type=str, required=True, help='time不能为空') self.parser.add_argument('custom_time', type=str, required=True, help='custom_time不能为空')
args = self.parser.parse_args() args = self.parser.parse_args()
args['ifa_id'] = g.ifa_id args['ifa_id'] = g.ifa_id
# 默认模版制作持仓报告 # 默认模版制作持仓报告
...@@ -197,7 +197,7 @@ class AppReportHandlers(Resource): ...@@ -197,7 +197,7 @@ class AppReportHandlers(Resource):
} }
else: else:
resp = { resp = {
"code": 0, "code": 8888,
"data": '', "data": '',
"lang": "zh_CN", "lang": "zh_CN",
"msg": "失败" "msg": "失败"
......
...@@ -18,6 +18,7 @@ from app.api.engine import TAMP_SQL, tamp_diagnose_app_engine, template_folder, ...@@ -18,6 +18,7 @@ from app.api.engine import TAMP_SQL, tamp_diagnose_app_engine, template_folder,
from app.model.tamp_diagnose_app import HoldReport, HoldDiagnoseReport, PeriodicReport, Customer, ReportView, FundReportManange from app.model.tamp_diagnose_app import HoldReport, HoldDiagnoseReport, PeriodicReport, Customer, ReportView, FundReportManange
from app.utils.jinjia2html_v2 import DataIntegrate from app.utils.jinjia2html_v2 import DataIntegrate
from app.celery import save_pdf from app.celery import save_pdf
from app.utils.format_transfer import npEncoder
def get_report_list(args): def get_report_list(args):
...@@ -299,8 +300,7 @@ def make_app_report(args): ...@@ -299,8 +300,7 @@ def make_app_report(args):
args['file'] = pdf_name args['file'] = pdf_name
args['create_time'] = datetime.datetime.now() args['create_time'] = datetime.datetime.now()
args['update_status'] = 2 args['update_status'] = 2
custom_time = args['time'] custom_time = args['custom_time']
args['custom_time'] = custom_time
data = {} data = {}
record_id = 0 record_id = 0
...@@ -353,7 +353,6 @@ def make_app_report(args): ...@@ -353,7 +353,6 @@ def make_app_report(args):
report_record = HoldReport(**args) report_record = HoldReport(**args)
tamp_diagnose_session.add(report_record) tamp_diagnose_session.add(report_record)
tamp_diagnose_session.flush() tamp_diagnose_session.flush()
# record_id = report_record.id return report_record.id
return report_record.get_file()
return False return False
\ No newline at end of file
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