|
@@ -70,6 +70,8 @@ case class CompanySummaryNg_new(s: SparkSession,
|
|
val ads_table = s"${project}.ads_$tab" //存量ads表
|
|
val ads_table = s"${project}.ads_$tab" //存量ads表
|
|
val inc_ads_table = s"${project}.inc_ads_$tab"
|
|
val inc_ads_table = s"${project}.inc_ads_$tab"
|
|
|
|
|
|
|
|
+ val inc_ads_last_ds = getLastPartitionsOrElse(inc_ads_table, "0")
|
|
|
|
+
|
|
val new_cols = getColumns(ads_table).intersect(getColumns(inc_ads_table))
|
|
val new_cols = getColumns(ads_table).intersect(getColumns(inc_ads_table))
|
|
|
|
|
|
val ads_last_ds = getLastPartitionsOrElse(ads_table, "0")
|
|
val ads_last_ds = getLastPartitionsOrElse(ads_table, "0")
|
|
@@ -94,14 +96,14 @@ case class CompanySummaryNg_new(s: SparkSession,
|
|
|FROM (
|
|
|FROM (
|
|
| SELECT DISTINCT $companyIdField as xjk_cid
|
|
| SELECT DISTINCT $companyIdField as xjk_cid
|
|
| FROM $inc_ads_table
|
|
| FROM $inc_ads_table
|
|
- | WHERE ds = $ds
|
|
|
|
|
|
+ | WHERE ds = $inc_ads_last_ds
|
|
| ) id_table
|
|
| ) id_table
|
|
|JOIN (
|
|
|JOIN (
|
|
| SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
| SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
| ,$companyIdField as xjk_cid
|
|
| ,$companyIdField as xjk_cid
|
|
| FROM $inc_ads_table
|
|
| FROM $inc_ads_table
|
|
| WHERE ds > '$ads_last_ds'
|
|
| WHERE ds > '$ads_last_ds'
|
|
- | AND ds < '$ds'
|
|
|
|
|
|
+ | AND ds < '$inc_ads_last_ds'
|
|
| UNION ALL
|
|
| UNION ALL
|
|
| SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
| SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
| ,$companyIdField as xjk_cid
|
|
| ,$companyIdField as xjk_cid
|
|
@@ -112,7 +114,7 @@ case class CompanySummaryNg_new(s: SparkSession,
|
|
|UNION ALL
|
|
|UNION ALL
|
|
|SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
|SELECT ${new_cols.map(getCastCols(_, "")).mkString(",")}
|
|
|FROM $inc_ads_table
|
|
|FROM $inc_ads_table
|
|
- |WHERE ds = $ds
|
|
|
|
|
|
+ |WHERE ds = $inc_ads_last_ds
|
|
|""".stripMargin)
|
|
|""".stripMargin)
|
|
.createOrReplaceTempView(tab_tmp_view)
|
|
.createOrReplaceTempView(tab_tmp_view)
|
|
}
|
|
}
|