lyb 3 роки тому
батько
коміт
fd1b6f3550

+ 7 - 2
src/main/scala/com/winhc/bigdata/spark/ng/jobs/args_company_job.scala

@@ -175,8 +175,8 @@ object args_company_job {
       , is_super_filter = false
     )
 
-    , args_company_job("bankruptcy_open_case", Seq("applicant", "respondent", "public_date")
-      , rowkey_udf = "md5(cleanup(concat_ws('',applicant,respondent,split_date(cast(public_date as String)))))"
+    , args_company_job("bankruptcy_open_case", Seq("applicant", "respondent", "public_date", "case_no")
+      , rowkey_udf = "md5(cleanup(concat_ws('', applicant, respondent, case_no, (cast(public_date as String)))))"
       , id_user_defined_rowkey = true
 
       , is_super_filter = false
@@ -408,6 +408,11 @@ object args_company_job {
       , rowkey_udf = "concat_ws('_', main_id, md5(cleanup(concat_ws('',main_id, split_date(cast(deal_time as String))))) )"
       , is_super_filter = false
     )
+
+    , args_company_job("company_change", Seq("company_id", "change_item", "change_time")
+      , rowkey_udf = "md5(cleanup(concat_ws('', company_id, change_item, split_date(cast(change_time as String)))))"
+      , is_super_filter = false
+    )
   )
 
   def get_args_company_job(tn: String): args_company_job = {

+ 1 - 0
src/main/scala/com/winhc/bigdata/spark/ng/utils/CompanySummaryNg_new.scala

@@ -59,6 +59,7 @@ object CompanySummaryNg_new {
     , get_default_summary_args("company_land_publicity", "company_id")
     , get_default_summary_args("company_bond", "company_id")
     , get_default_summary_args("company_tele_license", "company_id")
+    , get_default_summary_args("company_change", "company_id")
 
 
     , SummaryArgs(table_name = "company_court_open_announcement_explode"

+ 2 - 0
src/main/scala/com/winhc/bigdata/spark/ng/utils/export_company_index_2_es.scala

@@ -300,6 +300,8 @@ object export_company_index_2_es {
       , "rowkey,company_id,bond_name,bond_full_name,bond_defined_code,bond_num,publisher_name,bond_type,publish_time,bond_trade_time,debt_rtng,create_time,update_time,deleted".split(","))
     , export_2_es_args("company_tele_license"
       , "rowkey,company_id,company_name,license_number,business_scope,is_available,create_time,update_time,deleted".split(","))
+    , export_2_es_args("company_change"
+      , "rowkey,company_id,company_name,category,change_item,content_before,content_after,change_time,create_time,update_time,deleted".split(","))
   )