| 
					
				 | 
			
			
				@@ -546,38 +546,17 @@ class ReportPush(object): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             # 项目 合计 长按识别二维码 会话 公众号菜单 公众号文章 小程序历史列表 扫一扫二维码 搜索 相册选取二维码 其他小程序 其他 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for x in customer_channel_details_data: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if x[0] in house_ids: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    house_name = x[1] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ele = [house_name] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    data = x[2:] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    total = sum(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ele.append(total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ele.extend(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    result_data_7.append(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    result_data_7.append(x) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             # 8: 集团项目获客来源场景分析 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if customer_type == 2: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 for x in brand_customer_channel_details: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if x[2] in house_ids or x[0] in brand_id_list: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        house_name = x[3] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        data = x[4:] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        total = sum(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.append(house_name) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.append(total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.extend(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        result_data_8.append(ele) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        result_data_8.append(x) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             elif customer_type == 1: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 for x in brand_customer_channel_details: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if x[2] in house_ids: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        house_name = x[3] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        data = x[4:] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        total = sum(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.append(house_name) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.append(total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        ele.extend(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        result_data_8.append(ele) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        result_data_8.append(ele) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        result_data_8.append(x) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             # 6: 项目获客来源场景分析 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             result_data_6 = self.house_with_brand_for_share(result_data_7, result_data_8) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -588,8 +567,27 @@ class ReportPush(object): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             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_data_7_format = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for x in result_data_7: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                house_name = x[1] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele = [house_name] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                data = x[2:] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                total = sum(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele.append(total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele.extend(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                result_data_7_format.append(ele) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            customer_data[7] = result_data_7_format 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            result_data_8_format = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for x in result_data_8: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                house_name = x[3] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                data = x[4:] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                total = sum(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele.append(house_name) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele.append(total) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ele.extend(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                result_data_8_format.append(ele) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            customer_data[8] = result_data_8_format 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             result[name] = customer_data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return result 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |