chang

eda/feededa/src/main/scala/com/gmei/strategy_clk_imp_oldUser.scala

@@ -70,8 +70,8 @@ object strategy_clk_imp_oldUser {
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
-      decive_id_oldUser.show()
-      decive_id_oldUser.createOrReplaceTempView("device_id_newUser")
+      decive_id_newUser.show()
+      decive_id_newUser.createOrReplaceTempView("device_id_newUser")
 
       val strategies = Seq("[1|2]$","[3|4]$","[5|6]$","[7|8]$")
       for (strategy <- strategies){
@@ -85,7 +85,6 @@ object strategy_clk_imp_oldUser {
              |and jd.device_id not in (select device_id from bl_device_list)
              |and jd.device_id not in (select device_id from blacklist)
              |and jd.stat_date ='${stat_date}'
-             |and device_id_old.decive_id is null
          """.stripMargin
         )
         clk_count_oldUser.show()
@@ -100,7 +99,6 @@ object strategy_clk_imp_oldUser {
              |and je.device_id not in (select device_id from bl_device_list)
              |and je.device_id not in (select device_id from blacklist)
              |and je.stat_date ='${stat_date}'
-             |and device_id_old.decive_id is null
          """.stripMargin
         )
         imp_count_oldUser.show()
@@ -116,7 +114,6 @@ object strategy_clk_imp_oldUser {
              |and jd.device_id not in (select device_id from bl_device_list)
              |and jd.device_id not in (select device_id from blacklist)
              |and jd.stat_date ='${stat_date}'
-             |and device_id_newUser.decive_id is null
          """.stripMargin
         )
         clk_count_newUser.show()
@@ -131,7 +128,6 @@ object strategy_clk_imp_oldUser {
              |and je.device_id not in (select device_id from bl_device_list)
              |and je.device_id not in (select device_id from blacklist)
              |and je.stat_date ='${stat_date}'
-             |and device_id_newUser.decive_id is null
          """.stripMargin
         )
         imp_count_newUser.show()