Merge remote-tracking branch 'origin/master'

src/main/scala/com/winhc/bigdata/spark/ng/jobs/args_company_job.scala

@@ -44,14 +44,14 @@ object args_company_job {
       , is_super_filter = false
       , where = "case_no_trim(case_no) is not null and name is not null"
     )
-    , args_company_job("company_zxr_restrict", Seq("case_no", "person_name","company_name")
+    , args_company_job("company_zxr_restrict", Seq("case_no", "person_name", "company_name")
       , rowkey_udf = "md5(cleanup(concat_ws('',case_no,person_name,company_name )))"
       , is_super_filter = false
       , verify_company_id = false
       , where = "case_no_trim(case_no) is not null and person_name is not null and length(trim(person_name))>=2 "
     )
 
-    , args_company_job("company_equity_info", Seq("reg_number", "pledgee_info", "pledgor_info","related_company_name")
+    , args_company_job("company_equity_info", Seq("reg_number", "pledgee_info", "pledgor_info", "related_company_name")
       , rowkey_udf = "md5(cleanup(concat_ws('',reg_number,equity_info_rowkey(pledgee_info,pledgor_info),related_company_name  )))"
       , is_super_filter = false
 
@@ -245,6 +245,18 @@ object args_company_job {
         , explode_args("defendant_info", "$.litigant_id", "defendant_info_id_explode")
       )
     )
+
+    , args_company_job("company_equity_pledge", Seq("stock_code", "transaction_date", "pledged_num")
+      , rowkey_udf = "md5(cleanup(concat_ws('',stock_code, split_date(cast(transaction_date as String)), pledged_num  )))"
+      , is_super_filter = false
+      , verify_company_id = false
+    )
+
+    , args_company_job("company_equity_pledge_holder", Seq("scode", "holder_name", "pledgee", "sharefrozennum", "ndate")
+      , rowkey_udf = "md5(cleanup(concat_ws('',scode, holder_name, pledgee, sharefrozennum, split_date(cast(ndate as String))  )))"
+      , is_super_filter = false
+      , verify_company_id = false
+    )
   )
 
   def get_args_company_job(tn: String): args_company_job = {

src/main/scala/com/winhc/bigdata/spark/ng/utils/export_company_index_2_es.scala

@@ -248,6 +248,10 @@ object export_company_index_2_es {
       , "rowkey,company_id,deleted".split(","))
     , export_2_es_args("company_lawsuit"
       , "rowkey,case_id,doc_id,case_no,doc_type,case_type,case_reason_level2,case_reason_level3,case_reason_level4,case_reason,case_reason_levelnum,case_stage,case_amt,court_name,court_province,court_city,court_level,judge_date,judge_year,judge_result,title,spider_date,update_date,plaintiff_info,defendant_info,litigant_info,all_lawyer,pub_date,pub_year,deleted".split(","))
+    , export_2_es_args("company_equity_pledge"
+      , "rowkey,company_name,company_id,stock_code,stock_abbreviation,transaction_date,pledged_ratio,pledged_shares,pledged_value,pledged_num,unlimited_pledged_shares,restricted_pledged_shares,one_year_change,industry,create_time,update_time,deleted".split(","))
+    , export_2_es_args("company_equity_pledge_holder"
+      , "rowkey,company_name,company_id,holder_name,holder_id,sharefrozennum,sz,pledgee,pledgee_id,yjx_pcx_type,ndate,scode,sname,create_time,update_time,deleted".split(","))
   )