binren 5 yıl önce
ebeveyn
işleme
6ef0fcfef2
1 değiştirilmiş dosya ile 11 ekleme ve 6 silme
  1. 11 6
      report_push.py

+ 11 - 6
report_push.py

@@ -528,12 +528,7 @@ class ReportPush(object):
                 for index, x in enumerate(all_data_history):
                     if x[2] in house_ids:
                         result_data_3.append(x)
-            customer_data[1] = result_data_1
-            customer_data[2] = result_data_2
-            customer_data[3] = result_data_3
-            customer_data[4] = result_data_4
-            customer_data[5] = result_data_5
-            result[name] = customer_data
+
             # 7: 单个项目小程序获客来源场景分析
             for x in customer_channel_details_data:
                 if x[0] in house_ids:
@@ -551,6 +546,16 @@ class ReportPush(object):
                         result_data_8.append(x)
 
             # 6: 项目获客来源场景分析
+
+            customer_data[1] = result_data_1
+            customer_data[2] = result_data_2
+            customer_data[3] = result_data_3
+            customer_data[4] = result_data_4
+            customer_data[5] = result_data_5
+            customer_data[6] = result_data_6
+            customer_data[7] = result_data_7
+            customer_data[8] = result_data_8
+            result[name] = customer_data
         return result
 
     def filter_by_brand_ids(self, data, brand_ids):