1

data_manage/pitcher_panel.py

@@ -341,37 +341,37 @@ 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
-       from order where  channel='{channel}' and dt>='{start}' group by formatDateTime(reg_time,'%Y-%m-%d')) b on a.dt=b.dt 
+       count(distinct if(subtractDays(date, 0)=reg_time,user_id,NULL)) reg_order_user1,
+       count(distinct if(subtractDays(date, 1)=reg_time,user_id,NULL)) reg_order_user2,
+       count(distinct if(subtractDays(date, 2)=reg_time,user_id,NULL)) reg_order_user3,
+       count(distinct if(subtractDays(date, 3)=reg_time,user_id,NULL)) reg_order_user4,
+       count(distinct if(subtractDays(date, 4)=reg_time,user_id,NULL)) reg_order_user5,
+       count(distinct if(subtractDays(date, 5)=reg_time,user_id,NULL)) reg_order_user6,
+       count(distinct if(subtractDays(date, 6)=reg_time,user_id,NULL)) reg_order_user7,
+       count(distinct if(subtractDays(date, 7)=reg_time,user_id,NULL)) reg_order_user8,
+       count(distinct if(subtractDays(date, 8)=reg_time,user_id,NULL)) reg_order_user9,
+       count(distinct if(subtractDays(date, 9)=reg_time,user_id,NULL)) reg_order_user10,
+       count(distinct if(subtractDays(date, 10)=reg_time,user_id,NULL)) reg_order_user11,
+       count(distinct if(subtractDays(date, 11)=reg_time,user_id,NULL)) reg_order_user12,
+       count(distinct if(subtractDays(date, 12)=reg_time,user_id,NULL)) reg_order_user13,
+       count(distinct if(subtractDays(date, 13)=reg_time,user_id,NULL)) reg_order_user14,
+       count(distinct if(subtractDays(date, 14)=reg_time,user_id,NULL)) reg_order_user15,
+       count(distinct if(subtractDays(date, 15)=reg_time,user_id,NULL)) reg_order_user16,
+       count(distinct if(subtractDays(date, 16)=reg_time,user_id,NULL)) reg_order_user17,
+       count(distinct if(subtractDays(date, 17)=reg_time,user_id,NULL)) reg_order_user18,
+       count(distinct if(subtractDays(date, 18)=reg_time,user_id,NULL)) reg_order_user19,
+       count(distinct if(subtractDays(date, 19)=reg_time,user_id,NULL)) reg_order_user20,
+       count(distinct if(subtractDays(date, 20)=reg_time,user_id,NULL)) reg_order_user21,
+       count(distinct if(subtractDays(date, 21)=reg_time,user_id,NULL)) reg_order_user22,
+       count(distinct if(subtractDays(date, 22)=reg_time,user_id,NULL)) reg_order_user23,
+       count(distinct if(subtractDays(date, 23)=reg_time,user_id,NULL)) reg_order_user24,
+       count(distinct if(subtractDays(date, 24)=reg_time,user_id,NULL)) reg_order_user25,
+       count(distinct if(subtractDays(date, 25)=reg_time,user_id,NULL)) reg_order_user26,
+       count(distinct if(subtractDays(date, 26)=reg_time,user_id,NULL)) reg_order_user27,
+       count(distinct if(subtractDays(date, 27)=reg_time,user_id,NULL)) reg_order_user28,
+       count(distinct if(subtractDays(date, 28)=reg_time,user_id,NULL)) reg_order_user29,
+       count(distinct if(subtractDays(date, 29)=reg_time,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 
 """
 
     total = ck.execute(f"select count(1) from ({sql}) a")[0][0]