From 51abb1ebe1fceb14a2fa45e71934de7173a432d9 Mon Sep 17 00:00:00 2001
From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com>
Date: Wed, 9 Mar 2022 14:35:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=A0=B9=E6=8D=AEri?=
 =?UTF-8?q?d=E7=94=9F=E6=88=90=E4=B8=BB=E9=A1=B5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TestCenter/tc_impl.py | 52 +++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/TestCenter/tc_impl.py b/TestCenter/tc_impl.py
index 344e0cb..ffe7daa 100644
--- a/TestCenter/tc_impl.py
+++ b/TestCenter/tc_impl.py
@@ -146,15 +146,21 @@ def generate_rid_information_script(rid, types):
             result type 返回数据
         """
         record = find_data('评价', '评价记录', {'评价ID': rid, '进行状态': '进行'})
-
         if not record:
-            return False, "没有正在进行的评价"
+            return "没有正在进行的评价"
 
-        inputs = find_data('评价', '综合信用填报', {'评价ID': rid})[0]
-        risks = {"风险数据": find_data('评价', '风险数据', {'评价ID': rid})[0]}
-        risks["风险数据"].pop('企业ID')
-        risks["风险数据"].pop('评价ID')
-        rating_inputs = {**inputs, **risks}
+        inputs = find_data('评价', '综合评价填报', {'评价ID': rid})
+        if not inputs:
+            return '未查询到此rid相关填报数据'
+
+        risks = find_data('评价', '风险数据', {'评价ID': rid})
+        if not risks:
+            return '未查询到此rid相关风险数据'
+
+        risk = {"风险数据": risks[0]}
+        risk["风险数据"].pop('企业ID')
+        risk["风险数据"].pop('评价ID')
+        rating_inputs = {**inputs[0], **risk}
 
         # 打分模型
         def general_model():
@@ -253,14 +259,21 @@ def generate_rid_information_script(rid, types):
         record = find_data('评价', '评价记录', {'评价ID': rid, '进行状态': '进行'})
 
         if not record:
-            return False, "没有正在进行的评价"
+            return "没有正在进行的评价"
 
-        inputs = find_data('评价', 'ESG评价填报', {'评价ID': rid})[0]
-        risks = {"风险数据": find_data('评价', 'ESG风险数据', {'评价ID': rid})[0]}
-        risks["风险数据"].pop('企业ID')
-        risks["风险数据"].pop('评价ID')
-        risks["风险数据"].pop('更新日期')
-        rating_inputs = {**inputs, **risks}
+        inputs = find_data('评价', 'ESG评价填报', {'评价ID': rid})
+        if not inputs:
+            return '未查询到此rid相关填报数据'
+
+        risks = find_data('评价', 'ESG风险数据', {'评价ID': rid})
+        if not risks:
+            return '未查询到此rid相关风险数据'
+
+        risk = {"风险数据": risks[0]}
+        risk["风险数据"].pop('企业ID')
+        risk["风险数据"].pop('评价ID')
+        risk["风险数据"].pop('更新日期')
+        rating_inputs = {**inputs[0], **risk}
 
         # 打分模型
         def general_model():
@@ -307,7 +320,8 @@ def generate_rid_information_script(rid, types):
             data = {
                 "company": rating_inputs['企业名称'],
                 "cid": rating_inputs['企业ID'],
-                "rid": rating_inputs['评价ID']
+                "rid": rating_inputs['评价ID'],
+                "type": 'esg'
             }
             res = requests.post(url, headers=headers, data=json.dumps(data))
             if res.status_code == 200:
@@ -334,16 +348,16 @@ def generate_rid_information_script(rid, types):
                 return False
 
         if not general_model():
-            return False, "打分失败"
+            return "打分失败"
 
         if not gen_report():
-            return False, "生成报告失败"
+            return "生成报告失败"
 
         if not gen_certified():
-            return False, "生成证书失败"
+            return "生成证书失败"
 
         if not company_index():
-            return False, "准备主页数据失败"
+            return "准备主页数据失败"
 
         update_data('评价', '评价记录', {'评价ID': rid}, {'进行状态': '完成'})
         return '执行完成'