1

data_manage/pitcher_panel.py

@@ -380,36 +380,36 @@ select dt,book,cost,
 left outer join (
 
 select toDate(formatDateTime(reg_time,'%Y-%m-%d')) dt,
-       count(distinct if(subtractDays(date, 1)>=reg_time,NULL,user_id)) reg_order_user1,
-       count(distinct if(subtractDays(date, 2)>=reg_time,NULL,user_id)) reg_order_user2,
-       count(distinct if(subtractDays(date, 3)>=reg_time,NULL,user_id)) reg_order_user3,
-       count(distinct if(subtractDays(date, 4)>=reg_time,NULL,user_id)) reg_order_user4,
-       count(distinct if(subtractDays(date, 5)>=reg_time,NULL,user_id)) reg_order_user5,
-       count(distinct if(subtractDays(date, 6)>=reg_time,NULL,user_id)) reg_order_user6,
-       count(distinct if(subtractDays(date, 7)>=reg_time,NULL,user_id)) reg_order_user7,
-       count(distinct if(subtractDays(date, 8)>=reg_time,NULL,user_id)) reg_order_user8,
-       count(distinct if(subtractDays(date, 9)>=reg_time,NULL,user_id)) reg_order_user9,
-       count(distinct if(subtractDays(date, 10)>=reg_time,NULL,user_id)) reg_order_user10,
-       count(distinct if(subtractDays(date, 11)>=reg_time,NULL,user_id)) reg_order_user11,
-       count(distinct if(subtractDays(date, 12)>=reg_time,NULL,user_id)) reg_order_user12,
-       count(distinct if(subtractDays(date, 13)>=reg_time,NULL,user_id)) reg_order_user13,
-       count(distinct if(subtractDays(date, 14)>=reg_time,NULL,user_id)) reg_order_user14,
-       count(distinct if(subtractDays(date, 15)>=reg_time,NULL,user_id)) reg_order_user15,
-       count(distinct if(subtractDays(date, 16)>=reg_time,NULL,user_id)) reg_order_user16,
-       count(distinct if(subtractDays(date, 17)>=reg_time,NULL,user_id)) reg_order_user17,
-       count(distinct if(subtractDays(date, 18)>=reg_time,NULL,user_id)) reg_order_user18,
-       count(distinct if(subtractDays(date, 19)>=reg_time,NULL,user_id)) reg_order_user19,
-       count(distinct if(subtractDays(date, 20)>=reg_time,NULL,user_id)) reg_order_user20,
-       count(distinct if(subtractDays(date, 21)>=reg_time,NULL,user_id)) reg_order_user21,
-       count(distinct if(subtractDays(date, 22)>=reg_time,NULL,user_id)) reg_order_user22,
-       count(distinct if(subtractDays(date, 23)>=reg_time,NULL,user_id)) reg_order_user23,
-       count(distinct if(subtractDays(date, 24)>=reg_time,NULL,user_id)) reg_order_user24,
-       count(distinct if(subtractDays(date, 25)>=reg_time,NULL,user_id)) reg_order_user25,
-       count(distinct if(subtractDays(date, 26)>=reg_time,NULL,user_id)) reg_order_user26,
-       count(distinct if(subtractDays(date, 27)>=reg_time,NULL,user_id)) reg_order_user27,
-       count(distinct if(subtractDays(date, 28)>=reg_time,NULL,user_id)) reg_order_user28,
-       count(distinct if(subtractDays(date, 29)>=reg_time,NULL,user_id)) reg_order_user29,
-       count(distinct if(subtractDays(date, 30)>=reg_time,NULL,user_id)) reg_order_user30
+       count(distinct if(toDate(formatDateTime(reg_time,'%Y-%m-%d'))=date,user_id,NULL)) reg_order_user1,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),1)>=date,user_id,NULL)) reg_order_user2,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),2)>=date,user_id,NULL)) reg_order_user3,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),3)>=date,user_id,NULL)) reg_order_user4,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),4)>=date,user_id,NULL)) reg_order_user5,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),5)>=date,user_id,NULL)) reg_order_user6,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),6)>=date,user_id,NULL)) reg_order_user7,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),7)>=date,user_id,NULL)) reg_order_user8,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),8)>=date,user_id,NULL)) reg_order_user9,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),9)>=date,user_id,NULL)) reg_order_user10,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),10)>=date,user_id,NULL)) reg_order_user11,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),11)>=date,user_id,NULL)) reg_order_user12,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),12)>=date,user_id,NULL)) reg_order_user13,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),13)>=date,user_id,NULL)) reg_order_user14,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),14)>=date,user_id,NULL)) reg_order_user15,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),15)>=date,user_id,NULL)) reg_order_user16,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),16)>=date,user_id,NULL)) reg_order_user17,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),17)>=date,user_id,NULL)) reg_order_user18,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),18)>=date,user_id,NULL)) reg_order_user19,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),19)>=date,user_id,NULL)) reg_order_user20,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),20)>=date,user_id,NULL)) reg_order_user21,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),21)>=date,user_id,NULL)) reg_order_user22,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),22)>=date,user_id,NULL)) reg_order_user23,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),23)>=date,user_id,NULL)) reg_order_user24,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),24)>=date,user_id,NULL)) reg_order_user25,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),25)>=date,user_id,NULL)) reg_order_user26,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),26)>=date,user_id,NULL)) reg_order_user27,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),27)>=date,user_id,NULL)) reg_order_user28,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),28)>=date,user_id,NULL)) reg_order_user29,
+       count(distinct if(addDays(formatDateTime(reg_time,'%Y-%m-%d'),29)>=date,user_id,NULL)) reg_order_user30
        from order where  channel='{channel}' and dt>='{start}' group by formatDateTime(reg_time,'%Y-%m-%d')) b on a.dt=b.dt 
 """