Merge branch 'ps_v0.2' into 'master'

update 十大股东bug

See merge request root/etl_tfse!17

CompanyData/CompanyDataImpl.py

@@ -65,9 +65,8 @@ class CompanyDataImpl(CompanyData):
 
         def prepare_share_holders():
             """"""
-
+            try:
                 self.share_holder = list()
-
                 data = self.db_tyc.find_single_column(
                     "公司背景",
                     "企业股东",
@@ -109,6 +108,33 @@ class CompanyDataImpl(CompanyData):
 
                     self.share_holder.append(share_holder)
 
+            except TypeError:
+                self.share_holder = list()
+                data = self.db_tyc.find_single_column(
+                    "公司背景",
+                    "十大股东",
+                    {"企业名称": self.name},
+                    "十大股东"
+                )
+
+                try:
+                    results = data['holderList']
+                except KeyError:
+                    raise LogConditionCheckFailed("企业股东数据异常", 200)
+
+                for result in results:
+                    share_holder = ShareHolder()
+                    share_holder.name = result['name']
+                    share_holder.share_holder_type = "公司" if result['cType'] == 1 else (
+                        "个人" if result['cType'] == 2 else "其他")
+                    share_holder.share_holding_ratio = result['proportion']
+                    share_holder.subscription_amount = None
+                    share_holder.subscription_date = None
+                    share_holder.paid_amount = None
+                    share_holder.payment_method = None
+                    share_holder.payment_time = None
+                    self.share_holder.append(share_holder)
+
             self.db_tfse.upsert_single_data(
                 "企业数据",
                 "企业数据_更新汇总",

CompanyData/CompanyDataRoutes.py

@@ -15,7 +15,6 @@ def basic_info():
     """
     初始化企业数据
     """
-    try:
     req = request.json
     company_data = CompanyDataImpl()
     company_data.cid = req['cid']
@@ -23,11 +22,19 @@ def basic_info():
     company_data.drag_data_from_tyc_api()
     company_data.prepare_company_init_data()
     return {"info": "企业数据初始化成功"}, 200
-    except ReturnConditionCheckFailed as e:
+    # try:
-        e.log_error()
+    #     req = request.json
-        return {"info": e.failed_info}, e.status_code
+    #     company_data = CompanyDataImpl()
-    except KeyError:
+    #     company_data.cid = req['cid']
-        return {"info": "参数错误"}, 400
+    #     company_data.name = req['company_name']
+    #     company_data.drag_data_from_tyc_api()
+    #     company_data.prepare_company_init_data()
+    #     return {"info": "企业数据初始化成功"}, 200
+    # except ReturnConditionCheckFailed as e:
+    #     e.log_error()
+    #     return {"info": e.failed_info}, e.status_code
+    # except KeyError:
+    #     return {"info": "参数错误"}, 400
 
 
 @company_route.route('/company_index_etl', methods=['POST'])