From 0e140e274fe993d24f1e51b48b2b1b87ae2f59fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= <sichanwong0527@gmail.com>
Date: Fri, 1 Jul 2022 12:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B3=A8=E5=86=8C=E5=90=8E?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Implements/Company/IndexImpl.py | 45 +++++++++++----------------------
 Routes/Company/IndexRoute.py    |  3 +--
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/Implements/Company/IndexImpl.py b/Implements/Company/IndexImpl.py
index db87a8a..aa88fc4 100644
--- a/Implements/Company/IndexImpl.py
+++ b/Implements/Company/IndexImpl.py
@@ -25,37 +25,22 @@ class CompanyIndexImpl(CompanyIndex):
             ["企业名称", "综信评价结果", "ESG评价结果"]
         )
 
-        head_info = CompanyIndex.HeadInfo()
-        head_info.name = None if not company_data else company_data['企业名称']
-        head_info.verify_status = verify_status
+        head_info = {
+            "企业名称": None if not company_data else company_data['企业名称'],
+            "企业认证": "已认证" if verify_status == "是" else "未认证",
+            "综合信用评价": {
+                "信用等级": company_data['综信评价结果']['信用等级'] if company_data.__contains__('综合信用评价') else None,
+                "信用评分": company_data['综信评价结果']['信用评分'] if company_data.__contains__('综合信用评价') else None,
+                "评价时间": company_data['综信评价结果']['评价时间'] if company_data.__contains__('综合信用评价') else None,
+            },
+            "ESG评价": {
+                "评价等级": company_data['ESG评价结果']['评价等级'] if company_data.__contains__("ESG评价") else None,
+                "ESG得分": company_data['ESG评价结果']['ESG得分'] if company_data.__contains__("ESG评价") else None,
+                "评价时间": company_data['ESG评价结果']['评价时间'] if company_data.__contains__("ESG评价") else None,
+            }
+        }
 
-        latest_cc_rating = CompanyIndex.HeadInfo.LatestCCRating()
-        latest_esg_rating = CompanyIndex.HeadInfo.LatestESGRating()
-
-        try:
-            cc_rating = company_data['综信评价结果']
-            latest_cc_rating.level = cc_rating['信用等级']
-            latest_cc_rating.score = str(cc_rating['信用评分'])
-            latest_cc_rating.rating_time = cc_rating['评价时间']
-        except TypeError:
-            latest_cc_rating.level = None
-            latest_cc_rating.score = None
-            latest_cc_rating.rating_time = None
-
-        try:
-            esg_rating = company_data['ESG评价结果']
-            latest_esg_rating.level = esg_rating['评价等级']
-            latest_esg_rating.score = str(esg_rating['ESG得分'])
-            latest_esg_rating.rating_time = esg_rating['评价时间']
-        except TypeError:
-            latest_esg_rating.level = None
-            latest_esg_rating.score = None
-            latest_esg_rating.rating_time = None
-
-        head_info.latest_cc_rating = latest_cc_rating
-        head_info.latest_esg_rating = latest_esg_rating
-
-        self.head_info = head_info
+        return head_info
 
     def get_business_info(self):
         """企业主页 基本信息"""
diff --git a/Routes/Company/IndexRoute.py b/Routes/Company/IndexRoute.py
index 1251fcf..1dcb070 100644
--- a/Routes/Company/IndexRoute.py
+++ b/Routes/Company/IndexRoute.py
@@ -15,8 +15,7 @@ def head_info_route(**kwargs):
     try:
         impl = CompanyIndexImpl()
         impl.cid = kwargs['cid']
-        impl.get_head_info()
-        result = impl.head_info.dict_to_return()
+        result = impl.get_head_info()
         return {"info": "查询结果", "result": result}, 200
     except ReturnConditionCheckFailed as e:
         return {"info": e.failed_info}, e.status_code