Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

许家凯 3 lat temu
rodzic
commit
2841461087

+ 2 - 0
src/main/scala/com/winhc/bigdata/spark/ng/relation/inc_human_relation_back.scala

@@ -39,6 +39,8 @@ case class inc_human_relation_back(s: SparkSession,
          |""".stripMargin).show(100, false)
 
     //AND     length(company_id) = 0   AND   length(person_id) = 33
+
+    addEmptyPartitionOrSkip(inc_ads_company_human_relation_back_deleted, ds)
   }
 
 }

+ 9 - 4
src/main/scala/com/winhc/bigdata/spark/ng/relation/lookup_tab_pid.scala

@@ -65,10 +65,10 @@ object args_job {
       , explode = "LATERAL VIEW explode( split(concat_ws('\u0001', cg_assignee_id, cg_executed_person_id, gn_executed_person_id, lf_executed_person_id, fz_executed_person_id, executed_person_id),'\u0001') ) key AS key_no"
       , keyno = "key_no")
 
-    , args_job(tableName = "company_lawsuit"
-      , explode = "LATERAL VIEW explode(jsonall_2_array('$.litigant_id', concat_ws('\u0001', defendant_info, plaintiff_info, litigant_info)) ) key AS key_no"
-      , keyno = "key_no"
-    )
+//    , args_job(tableName = "company_lawsuit"
+//      , explode = "LATERAL VIEW explode(jsonall_2_array('$.litigant_id', concat_ws('\u0001', defendant_info, plaintiff_info, litigant_info)) ) key AS key_no"
+//      , keyno = "key_no"
+//    )
 
     , args_job(tableName = "company"
       , rowkey = "company_id"
@@ -94,6 +94,11 @@ object args_job {
       , tar_tab_flag = "1"
       , keyno = "key_no"
     )
+
+    , args_job(tableName = "wenshu_detail_v2"
+      , explode = "LATERAL VIEW explode(jsonall_2_array('$.litigant_id', concat_ws('\u0001', defendant_info, plaintiff_info, litigant_info)) ) key AS key_no"
+      , keyno = "key_no"
+    )
   )
 
   def get_args_company_job(tn: String): args_job = {