晏永年 4 anos atrás
pai
commit
f754ea1289

+ 4 - 4
src/main/scala/com/winhc/bigdata/spark/jobs/JustiCase.scala

@@ -29,11 +29,11 @@ case class JustiCase(s: SparkSession,
       s"""
          |SELECT  *
          |FROM    $project.ods_$tableName
-         |WHERE   ds=ods_ds AND ${toCol} != NULL
+         |WHERE   ds=${ods_ds} AND ${toCol} != NULL
          |UNION
          |SELECT  *
          |FROM    $project.inc_ods_$tableName
-         |WHERE   ds=inc_ods_ds AND ${toCol} != NULL
+         |WHERE   ds=${inc_ods_ds} AND ${toCol} != NULL
          |""".stripMargin)
     val edgeRDD = dfRelations.select(allCols.map(column => col(column).cast("string")).toSeq: _*).rdd.flatMap(r => {
       val case_no_from = r.getAs[String](fromCol)
@@ -77,11 +77,11 @@ case class JustiCase(s: SparkSession,
         s"""
            |SELECT  get_justicase_id(CASE_NO) AS justicase_id, *
            |FROM    $project.ods_$tableName
-           |WHERE   ds=ods_ds  AND ${toCol} == NULL
+           |WHERE   ds=${ods_ds}  AND ${toCol} == NULL
            |UNION
            |SELECT  *
            |FROM    $project.inc_ods_$tableName
-           |WHERE   ds=inc_ods_ds AND ${toCol} == NULL
+           |WHERE   ds=${inc_ods_ds} AND ${toCol} == NULL
            |""".stripMargin))//.show(100)
       .createOrReplaceTempView(s"tmp_graphx_$tableName")