Merge branch 'master' into 'v0.21'

# Conflicts:
#   DBInitial/demo.py

CompanyData/job_scripts.py

@@ -44,7 +44,7 @@ def basic_info_etl(cid, company_name):
     member_info = FIND_DATA_IN_TYC('公司背景', '主要人员', {"企业名称": company_name})
 
     # Returns
-    data = read_json_file('/company/static/template/基本信息.json')
+    data = read_json_file('/CompanyData/static/template/基本信息.json')
 
     # 处理工商信息
     def business_data():
@@ -165,7 +165,7 @@ def cc_rating_etl(rid):
         result['综合信用表现'] = dict()
         result['综合信用表现']['指标雷达'] = dict()
         result['综合信用表现']['指标雷达']['指标得分'] = rating_score
-        result['综合信用表现']['指标雷达']['最大分数'] = read_json_file('/company/static/refers/general.json')['radar']
+        result['综合信用表现']['指标雷达']['最大分数'] = read_json_file('/CompanyData/static/refers/general.json')['radar']
 
     def credit_analysis_content():
         """

RatingData/scripts/common.py

@@ -151,11 +151,11 @@ def get_tfse_data(param):
 
     report_data = dict()
     # 评价结果
-    es = FIND_SINGLE_DATA_BY_REQ('综信评价数据', '评价结果', {'评价ID': rid}, ["评价年度", "财务评分"])
+    es = FIND_SINGLE_DATA_BY_REQ('综信评价数据', '评价结果', {'评价ID': rid}, ["企业名称", "评价年度", "财务评分", "经营评分", "信用等级", "评价时间"])
     # 综合评价填报
     cef = FIND_SINGLE_DATA_BY_REQ('综信评价数据', '填报数据', {'评价ID': rid}, ["财务填报", "行业选择"])
     # 指标明细
-    fid = FIND_ALL_DATA_BY_REQ('综信评价数据', '财指结果', {'企业ID': rid},
+    fid = FIND_ALL_DATA_BY_REQ('综信评价数据', '财指结果', {'企业ID': cid},
                                ['报告期', '净资产收益率', '存货周转率', '已获利息倍数', '应收账款周转率', '总资产周转率', '总资产增长率', '总资产报酬率', '技术投入比率', '营业增长率', '资产负债率', '速动比率'])
     # 基本信息
     cbd = FIND_DATA_N_TYC(db='公司背景', col='基本信息', query={'企业名称': company})[0]
@@ -177,7 +177,7 @@ def get_tfse_data(param):
     # 融资历史
     fh = FIND_DATA_N_TYC(db='公司发展', col='融资历史', query={'企业名称': company})[0]
     # 风险数据
-    rd = FIND_SINGLE_DATA_BY_REQ('综信评价数据', '风险数据', {'评价ID': rid}, ["合规风险", "经营风险"])
+    rd = FIND_SINGLE_DATA_BY_REQ('综信评价数据', '风险数据', {'评价ID': rid}, ["合规风险", "经营风险", "关联风险"])
     # 周边风险
     pr = FIND_DATA_N_TYC(db='天眼风险', col='周边风险', query={'企业名称': company})[0]
     report_data['评价结果'] = es

RatingData/scripts/report/abstract.py

@@ -139,6 +139,8 @@ def evaluation_view_manufacturing(param1, param2):
         # 执行子方法
         scale()
         advantage_area()
+        part_01['year'] = None
+        part_01['place'] = None
         return part_01
 
     def para_02():
@@ -459,8 +461,8 @@ def attention(param):
     Returns:
         result: 关注结果
     """
-    weight = read_json_file('/rating/static/attention/weights.json')
-    describe = read_json_file('/rating/static/attention/describe.json')
+    weight = read_json_file('/RatingData/static/attention/weights.json')
+    describe = read_json_file('/RatingData/static/attention/describe.json')
     data = param['评价结果']['财务评分']
     del param['评价结果']['财务评分']['合计']
     for k, v in data.items():

RatingData/scripts/report/company_profile.py

@@ -449,10 +449,17 @@ def import_export(param):
     part_01 = dict()
     if data_01:
         part_01['import_export_power'] = '拥有' + data_01['baseInfo']['creditRating']
+        part_01['year_03'] = None
+        part_01['amount'] = None
+        part_01['proportion'] = None
         part_01['influence'] = '大'
     else:
         part_01['import_export_power'] = '无'
+        part_01['year_03'] = None
+        part_01['amount'] = None
+        part_01['proportion'] = None
         part_01['influence'] = '小'
+
     result.append(part_01)
     return result