Merge remote-tracking branch 'origin/master'

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

@@ -125,8 +125,8 @@ object args_company_job {
         , 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 )))"
+    , args_company_job("company_zxr_final_case", Seq("case_no,name")
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_no,name )))"
       , is_super_filter = false
     )
     , args_company_job("company_tax_contravention", Seq("case_info", "company_id")
@@ -147,15 +147,15 @@ object args_company_job {
       , id_user_defined_rowkey = true
     )
     , args_company_job("company_mortgage_pawn", Seq("main_id", "pawn_name", "detail")
-      , rowkey_udf = "md5(cleanup(concat_ws('',main_id,pawn_name,detail )))"
+      , rowkey_udf = "concat_ws('_', main_id, md5(cleanup(concat_ws('',pawn_name,detail ))) )"
       , is_super_filter = false
     )
     , args_company_job("company_mortgage_change", Seq("main_id", "change_date", "change_content")
-      , rowkey_udf = "md5(cleanup(concat_ws('',main_id,split_date(cast(change_date as String)),change_content )))"
+      , rowkey_udf = "concat_ws('_', main_id, md5(cleanup(concat_ws('',split_date(cast(change_date as String)),change_content ))) )"
       , is_super_filter = false
     )
     , args_company_job("company_mortgage_people", Seq("main_id")
-      , rowkey_udf = "md5(cleanup(concat_ws('',main_id)))"
+      , rowkey_udf = "concat_ws('_', main_id, md5(cleanup(concat_ws('',main_id))) )"
       , is_super_filter = false
     )
     , args_company_job("company_double_random_check_info", Seq("check_task_num", "check_plan_num")
@@ -164,7 +164,7 @@ object args_company_job {
       , id_user_defined_rowkey = true
     )
     , args_company_job("company_double_random_check_result_info", Seq("main_id", "check_item", "check_result")
-      , rowkey_udf = "md5(cleanup(concat_ws('',main_id,check_item,check_result)))"
+      , rowkey_udf = "concat_ws('_', main_id, md5(cleanup(concat_ws('',check_item,check_result))) )"
       , is_super_filter = false
     )
 

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

@@ -210,7 +210,7 @@ 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(","))
+      , "rowkey,defendant_info,plaintiff_info,court,start_date,title,case_no,deleted".split(","))
     , export_2_es_args("company_court_register"
       , "rowkey,case_no,case_reason,defendant_info,plaintiff_info,filing_date,deleted".split(","))