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) # 子公司数量