renyupeng 2 سال پیش
والد
کامیت
a4ad5ad917

+ 14 - 13
Apietl/task/BytendaceOperationPerformanceBase.py

@@ -92,7 +92,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -163,7 +163,7 @@ from (
                   select stat_datetime,
                          account_id,
                          cost,
-                         user_id,
+                         assignee_one,
                          project_id,
                          project_name,
                          company_id,
@@ -202,7 +202,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -320,7 +320,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -436,7 +436,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -509,7 +509,7 @@ from (
                   select stat_datetime,
                          account_id,
                          cost,
-                         user_id,
+                         assignee_two,
                          project_id,
                          project_name,
                          company_id,
@@ -552,7 +552,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -670,7 +670,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -787,7 +787,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -904,7 +904,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -976,7 +976,7 @@ from (
                   select stat_datetime,
                          account_id,
                          cost,
-                         transferor_three,
+                         assignee_three,
                          project_id,
                          project_name,
                          company_id,
@@ -999,7 +999,8 @@ from (
                                   project_id,
                                   project_name,
                                   company_id,
-                                  company_name
+                                  company_name,
+                                  assignee_three
                            from (select account_id,
                                         cost,
                                         stat_datetime,
@@ -1021,7 +1022,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three

+ 14 - 13
Apietl/task/KuaishouOperationPerformanceBackChargeBase.py

@@ -97,7 +97,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -168,7 +168,7 @@ from (
                          account_id,
                          contract_rebate_real_charged_in_yuan,
                          direct_rebate_real_charged_in_yuan,
-                         user_id,
+                         assignee_one,
                          project_id,
                          project_name,
                          company_id,
@@ -209,7 +209,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -330,7 +330,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -449,7 +449,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -523,7 +523,7 @@ from (
                          account_id,
                          contract_rebate_real_charged_in_yuan,
                          direct_rebate_real_charged_in_yuan,
-                         user_id,
+                         assignee_two,
                          project_id,
                          project_name,
                          company_id,
@@ -568,7 +568,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -689,7 +689,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -808,7 +808,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -928,7 +928,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -1001,7 +1001,7 @@ from (
                          account_id,
                          contract_rebate_real_charged_in_yuan,
                          direct_rebate_real_charged_in_yuan,
-                         transferor_three,
+                         assignee_three,
                          project_id,
                          project_name,
                          company_id,
@@ -1025,7 +1025,8 @@ from (
                                   project_id,
                                   project_name,
                                   company_id,
-                                  company_name
+                                  company_name,
+                                  assignee_three
                            from (select account_id,
                                         contract_rebate_real_charged_in_yuan,
                                         direct_rebate_real_charged_in_yuan,
@@ -1048,7 +1049,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three

+ 14 - 14
Apietl/task/KuaishouOperationPerformanceBase.py

@@ -21,7 +21,6 @@ class KuaishouOperationPerformanceBase:
         '%Y%m%d') """
         start_date = TidbProConn.quary(self.conn, start_date_sql)[0][0]
         end_date = TidbProConn.quary(self.conn, end_date_sql)[0][0]
-
         try:
             sql = """
 replace into application.kuaishou_operation_performance_base
@@ -92,7 +91,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -163,7 +162,7 @@ from (
                   select stat_date,
                          account_id,
                          charge,
-                         user_id,
+                         assignee_one,
                          project_id,
                          project_name,
                          company_id,
@@ -202,7 +201,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -320,7 +319,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -436,7 +435,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -509,7 +508,7 @@ from (
                   select stat_date,
                          account_id,
                          charge,
-                         user_id,
+                         assignee_two,
                          project_id,
                          project_name,
                          company_id,
@@ -552,7 +551,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -670,7 +669,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -787,7 +786,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -904,7 +903,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three
@@ -976,7 +975,7 @@ from (
                   select stat_date,
                          account_id,
                          charge,
-                         transferor_three,
+                         assignee_three,
                          project_id,
                          project_name,
                          company_id,
@@ -999,7 +998,8 @@ from (
                                   project_id,
                                   project_name,
                                   company_id,
-                                  company_name
+                                  company_name,
+                                  assignee_three
                            from (select account_id,
                                         charge,
                                         stat_date,
@@ -1021,7 +1021,7 @@ from (
                                          transferor_date_three)                                   as         transferor_date_three,
                                       assignee_one,
                                       if(assignee_one = assignee_two, '', assignee_two)                      assignee_two,
-                                      if(assignee_one = assignee_three, '', assignee_three)                  assignee_three,
+                                      if(assignee_two = assignee_three, '', assignee_three)                  assignee_three,
                                       assignee_date_one,
                                       if(assignee_date_one = assignee_date_two, '', assignee_date_two)       assignee_date_two,
                                       if(assignee_date_one = assignee_date_three, '', assignee_date_three)   assignee_date_three