From 618805291bf621becbf687fbba02a5ceba89862a Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Thu, 24 Oct 2019 10:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E9=80=92=E6=97=A5=E6=9C=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 daily_report/dreport.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/daily_report/dreport.py b/daily_report/dreport.py
index c7752e3..0f604cf 100644
--- a/daily_report/dreport.py
+++ b/daily_report/dreport.py
@@ -94,7 +94,7 @@ class Report:
                     v_event_{args['suffix']} 
                 where
                     gameid='{args['gameid']}' 
-                    and channel='{args['channelid']}' 
+                    and "channel"='{args['channelid']}' 
                     and "$part_event"='event_11_1' 
                     and "$part_date"='{self.day}'"""
 
@@ -104,7 +104,7 @@ class Report:
                     v_event_{args['suffix']} 
                 where
                     gameid='{args['gameid']}' 
-                    and channel='{args['channelid']}' 
+                    and "channel"='{args['channelid']}' 
                     and "$part_event"='event_11_1' 
                     and account_register_date between timestamp'{self.day} 00:00:00' and timestamp'{self.day} 23:59:59'"""
 
@@ -115,7 +115,7 @@ class Report:
                 where
                     "$part_event"='event_11_10' 
                     and  gameid='{args['gameid']}' 
-                    and channel='{args['channelid']}' 
+                    and "channel"='{args['channelid']}' 
                     and "$part_event"='event_11_1' 
                     and "$part_date"='{self.day}'"""
 
@@ -137,6 +137,7 @@ class Report:
         where
             "$part_event"='event_21_2' 
             and gameid='{args['gameid']}' 
+            and "channel"='{args['channelid']}' 
             and "$part_date"='{self.day}' """
 
         ad_101_sql = f"""SELECT
@@ -177,6 +178,8 @@ class Report:
                     v_event_19 
                 where
                     "$part_event"='event_1_4' 
+                    and gameid='{args['gameid']}' 
+                    and "channel"='{args['channelid']}'
                     and "$part_date"='{self.day}'
                     and "jump_result"=1 """
         try:
@@ -210,7 +213,7 @@ class Report:
             v_event_{args['suffix']} 
         where
             gameid='{args['gameid']}' 
-            and channel='{args['channelid']}' 
+            and "channel"='{args['channelid']}' 
             and "$part_event"='event_11_1' 
             and "$part_date"='{self.day}'
             and from_appid='{args['fromappid']}'"""
@@ -220,7 +223,7 @@ class Report:
             v_event_{args['suffix']} 
         where
             gameid='{args['gameid']}' 
-            and channel='{args['channelid']}' 
+            and "channel"='{args['channelid']}' 
             and "$part_event"='event_11_1' 
             and account_register_date between timestamp'{self.day} 00:00:00' and timestamp'{self.day} 23:59:59'
             and from_appid='{args['fromappid']}'   """
@@ -232,7 +235,7 @@ class Report:
         where
             "$part_event"='event_11_10' 
             and  gameid='{args['gameid']}' 
-            and channel='{args['channelid']}' 
+            and "channel"='{args['channelid']}' 
             and "$part_event"='event_11_1' 
             and "$part_date"='{self.day}'
             and from_appid='{args['fromappid']}'  """
@@ -244,7 +247,7 @@ class Report:
                 where
                     "$part_event"='event_11_11' 
                     and  gameid='{args['gameid']}' 
-                    and channel='{args['channelid']}' 
+                    and "channel"='{args['channelid']}' 
                     and "$part_event"='event_11_1' 
                     and "$part_date"='{self.day}'
                     and from_appid='{args['fromappid']}'  """
@@ -270,6 +273,8 @@ class Report:
             v_event_19 
         where
             "$part_event"='event_1_4' 
+            and  gameid='{args['gameid']}' 
+            and "channel"='{args['channelid']}'
             and "$part_date"='{self.day}'
             and "jump_appid"='{args['fromappid']}'
             and "jump_result"=1 """