Explorar o código

fix: 司法案件上游数据采用生产环境表

许家凯 %!s(int64=4) %!d(string=hai) anos
pai
achega
5acafa15ed

+ 6 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelation_CaseAgg.scala

@@ -31,12 +31,14 @@ case class JudicialCaseRelation_CaseAgg(s: SparkSession,
   }
 
   private def etl_wenshu(ds: String): Unit = {
-    def tableName = "wenshu_detail"
+    val tableName = "wenshu_detail"
+
+    val org_tab = s"winhc_eci.ods_$tableName"
 
     val table_id = table_id_map(tableName)
     val other_cols = Seq("yg_name", "court_name", "case_no", "bg_name") ++ Seq(table_id, "ds", "connect_case_no")
 
-    val ods_end_ds = getLastPartitionsOrElse(s"winhc_eci_dev.ods_$tableName", "0")
+    val ods_end_ds = getLastPartitionsOrElse(org_tab, "0")
     val tmp_tab = s"all_${tableName}_tmp_$ods_end_ds"
 
     sql(
@@ -47,12 +49,12 @@ case class JudicialCaseRelation_CaseAgg(s: SparkSession,
          |                    ,ROW_NUMBER() OVER(PARTITION BY $table_id ORDER BY ds DESC ) AS num
          |            FROM    (
          |                        SELECT  ${other_cols.mkString(",")}
-         |                        FROM    winhc_eci_dev.ods_$tableName
+         |                        FROM    $org_tab
          |                        WHERE   ds > 0
          | ---                        WHERE   ds = '$ods_end_ds'
          | ---                        UNION ALL
          | ---                        SELECT  ${other_cols.mkString(",")}
-         | ---                        FROM    winhc_eci_dev.inc_ods_$tableName
+         | ---                        FROM    $org_tab
          | ---                        WHERE   ds > $ods_end_ds
          |                    ) AS t1
          |        ) AS t2