ck 4 лет назад
Родитель
Сommit
27f9d704f5
1 измененных файлов с 32 добавлено и 31 удалено
  1. 32 31
      app/etl/dw/dw_channel_daily.py

+ 32 - 31
app/etl/dw/dw_channel_daily.py

@@ -131,36 +131,36 @@ def dw_channel_user_daily():
     sql="""
 select toDate(formatDateTime(reg_time,'%Y-%m-%d')) as dt,
             channel,
-           count(distinct if(subtractDays(date, 1)>=reg_time,null,user_id)) dc1,
-           count(distinct if(subtractDays(date, 2)>=reg_time,null,user_id)) dc2,
-           count(distinct if(subtractDays(date, 3)>=reg_time,null,user_id)) dc3,
-           count(distinct if(subtractDays(date, 4)>=reg_time,null,user_id)) dc4,
-           count(distinct if(subtractDays(date, 5)>=reg_time,null,user_id)) dc5,
-           count(distinct if(subtractDays(date, 6)>=reg_time,null,user_id)) dc6,
-           count(distinct if(subtractDays(date, 7)>=reg_time,null,user_id)) dc7,
-           count(distinct if(subtractDays(date, 8)>=reg_time,null,user_id)) dc8,
-           count(distinct if(subtractDays(date, 9)>=reg_time,null,user_id)) dc9,
-           count(distinct if(subtractDays(date, 10)>=reg_time,null,user_id)) dc10,
-           count(distinct if(subtractDays(date, 11)>=reg_time,null,user_id)) dc11,
-           count(distinct if(subtractDays(date, 12)>=reg_time,null,user_id)) dc12,
-           count(distinct if(subtractDays(date, 13)>=reg_time,null,user_id)) dc13,
-           count(distinct if(subtractDays(date, 14)>=reg_time,null,user_id)) dc14,
-           count(distinct if(subtractDays(date, 15)>=reg_time,null,user_id)) dc15,
-           count(distinct if(subtractDays(date, 16)>=reg_time,null,user_id)) dc16,
-           count(distinct if(subtractDays(date, 17)>=reg_time,null,user_id)) dc17,
-           count(distinct if(subtractDays(date, 18)>=reg_time,null,user_id)) dc18,
-           count(distinct if(subtractDays(date, 19)>=reg_time,null,user_id)) dc19,
-           count(distinct if(subtractDays(date, 20)>=reg_time,null,user_id)) dc20,
-           count(distinct if(subtractDays(date, 21)>=reg_time,null,user_id)) dc21,
-           count(distinct if(subtractDays(date, 22)>=reg_time,null,user_id)) dc22,
-           count(distinct if(subtractDays(date, 23)>=reg_time,null,user_id)) dc23,
-           count(distinct if(subtractDays(date, 24)>=reg_time,null,user_id)) dc24,
-           count(distinct if(subtractDays(date, 25)>=reg_time,null,user_id)) dc25,
-           count(distinct if(subtractDays(date, 26)>=reg_time,null,user_id)) dc26,
-           count(distinct if(subtractDays(date, 27)>=reg_time,null,user_id)) dc27,
-           count(distinct if(subtractDays(date, 28)>=reg_time,null,user_id)) dc28,
-           count(distinct if(subtractDays(date, 29)>=reg_time,null,user_id)) dc29,
-           count(distinct if(subtractDays(date, 30)>=reg_time,null,user_id)) dc30
+           count(distinct if(subtractDays(date, 1)>=toDate(reg_time),null,user_id)) dc1,
+           count(distinct if(subtractDays(date, 2)>=toDate(reg_time),null,user_id)) dc2,
+           count(distinct if(subtractDays(date, 3)>=toDate(reg_time),null,user_id)) dc3,
+           count(distinct if(subtractDays(date, 4)>=toDate(reg_time),null,user_id)) dc4,
+           count(distinct if(subtractDays(date, 5)>=toDate(reg_time),null,user_id)) dc5,
+           count(distinct if(subtractDays(date, 6)>=toDate(reg_time),null,user_id)) dc6,
+           count(distinct if(subtractDays(date, 7)>=toDate(reg_time),null,user_id)) dc7,
+           count(distinct if(subtractDays(date, 8)>=toDate(reg_time),null,user_id)) dc8,
+           count(distinct if(subtractDays(date, 9)>=toDate(reg_time),null,user_id)) dc9,
+           count(distinct if(subtractDays(date, 10)>=toDate(reg_time),null,user_id)) dc10,
+           count(distinct if(subtractDays(date, 11)>=toDate(reg_time),null,user_id)) dc11,
+           count(distinct if(subtractDays(date, 12)>=toDate(reg_time),null,user_id)) dc12,
+           count(distinct if(subtractDays(date, 13)>=toDate(reg_time),null,user_id)) dc13,
+           count(distinct if(subtractDays(date, 14)>=toDate(reg_time),null,user_id)) dc14,
+           count(distinct if(subtractDays(date, 15)>=toDate(reg_time),null,user_id)) dc15,
+           count(distinct if(subtractDays(date, 16)>=toDate(reg_time),null,user_id)) dc16,
+           count(distinct if(subtractDays(date, 17)>=toDate(reg_time),null,user_id)) dc17,
+           count(distinct if(subtractDays(date, 18)>=toDate(reg_time),null,user_id)) dc18,
+           count(distinct if(subtractDays(date, 19)>=toDate(reg_time),null,user_id)) dc19,
+           count(distinct if(subtractDays(date, 20)>=toDate(reg_time),null,user_id)) dc20,
+           count(distinct if(subtractDays(date, 21)>=toDate(reg_time),null,user_id)) dc21,
+           count(distinct if(subtractDays(date, 22)>=toDate(reg_time),null,user_id)) dc22,
+           count(distinct if(subtractDays(date, 23)>=toDate(reg_time),null,user_id)) dc23,
+           count(distinct if(subtractDays(date, 24)>=toDate(reg_time),null,user_id)) dc24,
+           count(distinct if(subtractDays(date, 25)>=toDate(reg_time),null,user_id)) dc25,
+           count(distinct if(subtractDays(date, 26)>=toDate(reg_time),null,user_id)) dc26,
+           count(distinct if(subtractDays(date, 27)>=toDate(reg_time),null,user_id)) dc27,
+           count(distinct if(subtractDays(date, 28)>=toDate(reg_time),null,user_id)) dc28,
+           count(distinct if(subtractDays(date, 29)>=toDate(reg_time),null,user_id)) dc29,
+           count(distinct if(subtractDays(date, 30)>=toDate(reg_time),null,user_id)) dc30
 from order where reg_time>'2019-03-18 00:00:00' group by toDate(formatDateTime(reg_time,'%Y-%m-%d')),channel"""
 
     data =ck.execute(sql)
@@ -255,4 +255,5 @@ if __name__ == '__main__':
 
     # dw_daily_channel()
     # dw_channel()
-    dw_channel_amount_daily()
+    # dw_channel_amount_daily()
+    dw_channel_user_daily()