From f45902f99e82cb70359c31645f74221ce87fc379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A3=AE?= Date: Fri, 31 Dec 2021 16:27:25 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Report/PdfReport.py | 2 +- Report/routes.py | 31 ++++++++++++++++++++++++++++++- Report/scripts/contents.py | 8 -------- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Report/PdfReport.py b/Report/PdfReport.py index 29efc77..ba799d5 100644 --- a/Report/PdfReport.py +++ b/Report/PdfReport.py @@ -115,7 +115,7 @@ class ReportGenerator: # 封面 def gen_cover(self): data = self.text_model - self.story.append(PageBreak()) + # self.story.append(PageBreak()) self.story.append(Paragraph('.', cover_space)) self.story.append(Paragraph(data['企业名称'], cover_company_style)) self.story.append(Paragraph('综合信用等级评价报告', cover_report_style)) diff --git a/Report/routes.py b/Report/routes.py index f865349..fbfdaac 100644 --- a/Report/routes.py +++ b/Report/routes.py @@ -70,6 +70,32 @@ def report_pdf(): # 保存PDF报告成功,返回FileID;保存PDF报告文件失败,返回False return file_id if file_id else False + def save_credit_data(param1, param2, param3): + """ + 保存信用分析数据 + Parameters: + param1: cid 企业ID + param2: rid 评价ID + param3: fileID PDF文件ID + Returns: + res: 处理成功返回报告FileID;处理失败返回False + """ + # 获取信用分析数据 + url = 'http://139.9.249.34:51011/etl_tfse/company/company_credit_etl' + token = 'dmfd7FshT!5Wng9^gcCcQV7T6FBnVgl4' + headers = {'token': token, 'Content-Type': 'application/json;charset=UTF-8'} + result = requests.post(url, headers=headers, data=json.dumps({"cid": param1, "rid": param2})) + if result.status_code == 200: + data = json.loads(result.text)['data'] + data['信用分析.查看报告'] = '/file/get_company_report?file_id={}'.format(param3) + upate_result = update_data('企业', '综合评价分析', {"企业ID": param1}, data) + if not upate_result: + return False + else: + return param3 + else: + return False + # Parameters req_body = request.json # 接收的json格式请求体 prepare_report_data = get_report_prepare_data(req_body) @@ -85,7 +111,10 @@ def report_pdf(): text_model = ReportModel(prepare_report_data['data'], report_template).report_values() save_report_result = save_report_data({"评价ID": text_model['评价ID']}, text_model, text_model['企业名称']) - if save_report_result is not False: + # 获取信用分析数据,并保存FileID + credit_data = save_credit_data(text_model['企业ID'], text_model['评价ID'], save_report_result) + + if credit_data is not False: return {"info": "生成报告成功", "result": {"FileID": save_report_result}}, 200 else: return {"info": "生成报告失败"}, 210 diff --git a/Report/scripts/contents.py b/Report/scripts/contents.py index b9e1c4a..86789f5 100644 --- a/Report/scripts/contents.py +++ b/Report/scripts/contents.py @@ -187,11 +187,3 @@ def handle_information_content(param1, param2): return report_content - -""" -1.公司概况-股东实力 -2.公司概况-对外投资 -3.公司概况-资质荣誉 - a.先判断返回的是否为“经查询,公司无技术、服务资质或品牌等方面的荣誉资质。”,是就只显示这句话,其他的删除。 - b.判断前三段每一段返回的报告数据是否为无数据,如果为无,整段赋值,等到最后再删除。 -"""