Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,7 @@ object args_company_job {
     )
 
     , args_company_job("company_court_open_announcement", Seq("case_no", "start_date")
-      , rowkey_udf = "md5(cleanup(concat_ws('',case_no_trim(case_no),split_date(cast(start_date as String)) )))"
+      , rowkey_udf = "md5(cleanup(concat_ws('',case_no,split_date(cast(start_date as String)) )))"
       , is_super_filter = false
       , where = "case_no_trim(case_no) is not null and is_json_str(defendant_info) and is_json_str(plaintiff_info) and is_json_str(litigant_info)"
       , explode_args = Seq(
@@ -97,7 +97,7 @@ 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 )))"
+      , rowkey_udf = "md5(cleanup(concat_ws('',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(
@@ -115,7 +115,7 @@ object args_company_job {
       )
     )
     , 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)) )))"
+      , rowkey_udf = "md5(cleanup(concat_ws('',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(