diff --git a/Certificate/CertificateImpl.py b/Certificate/CertificateImpl.py index 9deec7c..01cbd31 100644 --- a/Certificate/CertificateImpl.py +++ b/Certificate/CertificateImpl.py @@ -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) diff --git a/Certificate/scripts/path_tool.py b/Certificate/scripts/path_tool.py index 8958513..c7c0712 100644 --- a/Certificate/scripts/path_tool.py +++ b/Certificate/scripts/path_tool.py @@ -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 diff --git a/DBHelper/MongoHelper.py b/DBHelper/MongoHelper.py index 9ce520a..b7fa46a 100644 --- a/DBHelper/MongoHelper.py +++ b/DBHelper/MongoHelper.py @@ -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 数据库 diff --git a/Report/PdfReport.py b/Report/PdfReport.py index a6b0e67..4fc0cd8 100644 --- a/Report/PdfReport.py +++ b/Report/PdfReport.py @@ -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() diff --git a/Report/ReportImpl.py b/Report/ReportImpl.py index dbf04fc..14bd5c7 100644 --- a/Report/ReportImpl.py +++ b/Report/ReportImpl.py @@ -890,7 +890,7 @@ class HandleReportData: return self.report_template -class GenerateRoport(ReportData): +class GenerateReport(ReportData): """报告生成类""" db = MongoHelper("tfse_v0.21") diff --git a/Report/ReportRoute.py b/Report/ReportRoute.py index 58a2b4e..baa0b47 100644 --- a/Report/ReportRoute.py +++ b/Report/ReportRoute.py @@ -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: diff --git a/Report/scripts/path_tool.py b/Report/scripts/path_tool.py index 5246c19..66803df 100644 --- a/Report/scripts/path_tool.py +++ b/Report/scripts/path_tool.py @@ -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