Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/scala/com/winhc/bigdata/spark/ng/jobs/args_company_job.scala
#	src/main/scala/com/winhc/bigdata/spark/ng/utils/export_company_index_2_es.scala

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

@@ -92,6 +92,50 @@ object args_company_job {
     )
 
 
+
+    , args_company_job("company_court_announcement", Seq("case_no", "announcement_type", "publish_date", "court_name")
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_no_trim(case_no),announcement_type,split_date(cast(publish_date as String)),court_name )))"
+      , is_super_filter = false
+      , where = "is_json_str(plaintiff_info) and is_json_str(litigant_info)"
+      , explode_args = Seq(
+        explode_args("plaintiff_info", "$.litigant_id", "plaintiff_info_id_explode")
+        , explode_args("litigant_info", "$.litigant_id", "litigant_info_id_explode")
+      )
+    )
+    , args_company_job("company_send_announcement", Seq("court", "start_date", "title")
+      , rowkey_udf = "md5(cleanup(concat_ws('',court,split_date(cast(start_date as String)),title )))"
+      , is_super_filter = false
+      , where = "is_json_str(litigant_info) and is_json_str(defendant_info) and is_json_str(plaintiff_info)"
+      , explode_args = Seq(
+        explode_args("plaintiff_info", "$.litigant_id", "plaintiff_info_id_explode")
+        , explode_args("defendant_info", "$.litigant_id", "defendant_info_id_explode")
+      )
+    )
+    , args_company_job("company_court_register", Seq("case_no", "filing_date")
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_no_trim(case_no),split_date(cast(filing_date as String)) )))"
+      , is_super_filter = false
+      , where = "is_json_str(litigant_info) and is_json_str(defendant_info) and is_json_str(plaintiff_info)"
+      , explode_args = Seq(
+        explode_args("plaintiff_info", "$.litigant_id", "plaintiff_info_id_explode")
+        , explode_args("defendant_info", "$.litigant_id", "defendant_info_id_explode")
+      )
+    )
+    , args_company_job("company_zxr_final_case", Seq("case_no")
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_no )))"
+      , is_super_filter = false
+    )
+    , args_company_job("company_tax_contravention", Seq("case_info", "company_id")
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_info,company_id )))"
+      , is_super_filter = false
+    )
+    , args_company_job("company_own_tax", Seq("tax_balance", "tax_category", "company_id")
+      , rowkey_udf = "md5(cleanup(concat_ws('',tax_balance,tax_category,company_id )))"
+      , is_super_filter = false
+    )
+    , args_company_job("company_check_info", Seq("check_type", "check_result", "check_org","check_date","company_id")
+      , rowkey_udf = "md5(cleanup(concat_ws('',check_type,check_result,check_org,split_date(cast(check_date as String)),company_id )))"
+      , is_super_filter = 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

@@ -169,6 +169,20 @@ object export_company_index_2_es {
 
 
 
+    , export_2_es_args("company_court_announcement"
+      , "rowkey,announcement_type,case_no,court_name,plaintiff_info,litigant_info,publish_date,deleted".split(","))
+    , export_2_es_args("company_send_announcement"
+      , "rowkey,defendant_info,plaintiff_info,court,start_date,title,deleted".split(","))
+    , export_2_es_args("company_court_register"
+      , "rowkey,case_no,case_reason,defendant_info,plaintiff_info,filing_date,deleted".split(","))
+    , export_2_es_args("company_zxr_final_case"
+      , "rowkey,name,keyno,court_name,case_final_time,case_create_time,case_no,exec_amount,status,deleted".split(","))
+    , export_2_es_args("company_tax_contravention"
+      , "rowkey,company_id,company_name,case_type,case_info,department,publish_time,deleted".split(","))
+    , export_2_es_args("company_own_tax"
+      , "rowkey,company_id,company_name,legal_name,tax_category,own_tax_amount,publish_date,tax_balance,new_tax_balance,deleted".split(","))
+    , export_2_es_args("company_check_info"
+      , "rowkey,company_id,company_name,check_org,check_type,check_date,check_result,deleted".split(","))
   )