From 48b4412b86c173f8feed2e0d6e81c4b79d651c04 Mon Sep 17 00:00:00 2001
From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:30:47 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E5=A4=84=E7=90=86=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E6=8A=95=E8=B5=84=E5=8D=A0=E6=AF=94=E4=B8=BANull=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=202.=E5=AF=B9=E5=A4=96=E6=8A=95=E8=B5=84?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=B8=AD=E4=BA=BA=E6=B0=91=E5=B8=81=E4=B8=8E?=
 =?UTF-8?q?=E7=BE=8E=E5=85=83=E8=BF=9B=E8=A1=8C=E6=8D=A2=E7=AE=97=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E5=AE=9A=E6=B1=87=E7=8E=876.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rating/scripts/common.py                 | 16 ++++++++++++----
 rating/scripts/report/company_profile.py |  5 ++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/rating/scripts/common.py b/rating/scripts/common.py
index 67ea9b8..d86de81 100644
--- a/rating/scripts/common.py
+++ b/rating/scripts/common.py
@@ -54,6 +54,8 @@ def calculate_amount(param):
     """
     计算数据之和
     清洗数据库数据，根据需要返回
+    注意：
+        货币单位不同，现在存在美元、人民币两种，汇率暂用6.5
     Parameters:
         param: 数据库数据
     Returns:
@@ -64,10 +66,16 @@ def calculate_amount(param):
     result['industry'] = list()
     result['base'] = list()
     for item in param:
-        try:
-            result['amount'] += item['amount']
-        except TypeError:
-            result['amount'] += 0
+        if item['amountSuffix'] == '万人民币':
+            try:
+                result['amount'] += item['amount']
+            except TypeError:
+                result['amount'] += 0
+        elif item['amountSuffix'] == '万美元':
+            try:
+                result['amount'] += item['amount'] * 6.5
+            except TypeError:
+                result['amount'] += 0
         result['industry'].append(item['category'])
         result['base'].append(item['base'])
     return result
diff --git a/rating/scripts/report/company_profile.py b/rating/scripts/report/company_profile.py
index d5d2818..e640cc9 100644
--- a/rating/scripts/report/company_profile.py
+++ b/rating/scripts/report/company_profile.py
@@ -247,7 +247,10 @@ def outbound_investment(param):
                 # 持股50%以上子公司
                 fifty_percent = list()
                 for item in data_01['result']:
-                    percent = float(item['percent'].replace('%', ''))
+                    try:
+                        percent = float(item['percent'].replace('%', ''))
+                    except ValueError:
+                        percent = 0
                     if percent > 50:
                         fifty_percent.append(item)
                 # 子公司数量