update 报告/证书生成
This commit is contained in:
parent
4b0a07f626
commit
560ccd66d0
|
@ -223,9 +223,9 @@ class GenerateCertificate:
|
|||
"""
|
||||
# 保存PDF报告文件,删除临时存储的报告
|
||||
if len(text_data) > 5:
|
||||
file_id = self.db.upsert_file('文件', 'ESG证书', certifice_pdf)
|
||||
file_id = self.db.upsert_certificate_file('文件', 'ESG证书', certifice_pdf)
|
||||
else:
|
||||
file_id = self.db.upsert_file('文件', '综信证书', certifice_pdf)
|
||||
file_id = self.db.upsert_certificate_file('文件', '综信证书', certifice_pdf)
|
||||
certificate_path = get_gen_certificate_path(name=certifice_pdf)
|
||||
os.remove(certificate_path)
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ def get_json_path(**kwargs):
|
|||
def gen_pdf_path(**kwargs):
|
||||
name = kwargs['name']
|
||||
project_abs_path = get_project_abs_path()
|
||||
pdf_relative_path = '/Certificate/static/certificate/{}.pdf'.format(name)
|
||||
pdf_relative_path = '/Certificate/static/certificate/{}'.format(name)
|
||||
pdf_abs_path = os.path.abspath(project_abs_path + pdf_relative_path)
|
||||
return pdf_abs_path
|
||||
|
||||
|
@ -33,6 +33,6 @@ def get_pic_path(**kwargs):
|
|||
def get_gen_certificate_path(**kwargs):
|
||||
name = kwargs['name']
|
||||
project_abs_path = get_project_abs_path()
|
||||
file_name = '/Certificate/static/certificate/' + '{}.pdf'.format(name)
|
||||
file_name = '/Certificate/static/certificate/' + '{}'.format(name)
|
||||
pdf_path = os.path.abspath(project_abs_path + file_name)
|
||||
return pdf_path
|
||||
|
|
|
@ -223,7 +223,7 @@ class MongoHelper:
|
|||
except Exception:
|
||||
return False
|
||||
|
||||
def upsert_file(self, param1, param2, param3):
|
||||
def upsert_certificate_file(self, param1, param2, param3):
|
||||
"""
|
||||
根据名称保存该企业报告
|
||||
param1: str 数据库
|
||||
|
|
|
@ -124,13 +124,11 @@ class ReportGenerator:
|
|||
# 生成报告
|
||||
def gen_report(self):
|
||||
if '报告类型' in self.text_model:
|
||||
offeset = 2
|
||||
self.gen_esg_cover()
|
||||
self.gen_menu()
|
||||
self.gen_esg_part()
|
||||
self.doc.multiBuild(self.story, canvasmaker=EsgHeaderAndFooterCanvas)
|
||||
else:
|
||||
offeset = 3
|
||||
self.gen_cover()
|
||||
self.gen_menu()
|
||||
self.gen_main_part()
|
||||
|
|
|
@ -890,7 +890,7 @@ class HandleReportData:
|
|||
return self.report_template
|
||||
|
||||
|
||||
class GenerateRoport(ReportData):
|
||||
class GenerateReport(ReportData):
|
||||
"""报告生成类"""
|
||||
db = MongoHelper("tfse_v0.21")
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from flask import Blueprint, request
|
||||
|
||||
from Report.ReportImpl import GenerateRoport
|
||||
from Report.ReportImpl import GenerateReport
|
||||
from Utils.ErrorUtil import ReturnConditionCheckFailed
|
||||
from common.scripts import verify_token
|
||||
|
||||
|
@ -12,7 +12,7 @@ report_route = Blueprint('report', __name__)
|
|||
def report_pdf():
|
||||
"""生成综信评价报告"""
|
||||
try:
|
||||
generate = GenerateRoport()
|
||||
generate = GenerateReport()
|
||||
generate.cid = request.json['cid']
|
||||
generate.rid = request.json['rid']
|
||||
generate.name = request.json['company']
|
||||
|
@ -30,7 +30,7 @@ def report_pdf():
|
|||
def report_esg_pdf():
|
||||
"""生成ESG报告PDF"""
|
||||
try:
|
||||
generate = GenerateRoport()
|
||||
generate = GenerateReport()
|
||||
generate.cid = request.json['cid']
|
||||
generate.rid = request.json['rid']
|
||||
generate.name = request.json['company']
|
||||
|
@ -49,7 +49,7 @@ def repor_common_pdf():
|
|||
"""生成PDF报告(管理端使用)"""
|
||||
try:
|
||||
text_model = request.json['text_model']
|
||||
generate = GenerateRoport()
|
||||
generate = GenerateReport()
|
||||
info, status = generate.generate_admin_report(text_model)
|
||||
return info, status
|
||||
except ReturnConditionCheckFailed as e:
|
||||
|
|
|
@ -18,7 +18,7 @@ def get_font_path(**kwargs):
|
|||
def gen_pdf_path(**kwargs):
|
||||
name = kwargs['name']
|
||||
project_abs_path = get_project_abs_path()
|
||||
pdf_relative_path = '/Report/static/Reports/{}.pdf'.format(name)
|
||||
pdf_relative_path = '/Report/static/Reports/{}'.format(name)
|
||||
pdf_abs_path = os.path.abspath(project_abs_path + pdf_relative_path)
|
||||
return pdf_abs_path
|
||||
|
||||
|
@ -33,6 +33,6 @@ def get_pic_path(**kwargs):
|
|||
def get_gen_report_path(**kwargs):
|
||||
name = kwargs['name']
|
||||
project_abs_path = get_project_abs_path()
|
||||
file_name = '/Report/static/Reports/' + '{}.pdf'.format(name)
|
||||
file_name = '/Report/static/Reports/' + '{}'.format(name)
|
||||
pdf_path = os.path.abspath(project_abs_path + file_name)
|
||||
return pdf_path
|
||||
|
|
Loading…
Reference in New Issue