| 
					
				 | 
			
			
				@@ -2519,7 +2519,8 @@ public class DataDashboardService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 视频 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<VideoPoolPlatformEnum> videoPoolType = Arrays.asList(VideoPoolPlatformEnum.GZH, VideoPoolPlatformEnum.HkSP, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                VideoPoolPlatformEnum.SPH, VideoPoolPlatformEnum.TOUTIAO, VideoPoolPlatformEnum.SOHU); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                VideoPoolPlatformEnum.SPH, VideoPoolPlatformEnum.TOUTIAO, VideoPoolPlatformEnum.SOHU, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                VideoPoolPlatformEnum.PQ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (VideoPoolPlatformEnum videoType : videoPoolType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ContentGroupFunnelExport item = ContentGroupFunnelExport.getDefault(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.setDateStr(dateStr); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2941,7 +2942,7 @@ public class DataDashboardService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ContentEffectGroupBySourceExport> result = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> isSameMiniprogram = Arrays.asList("相同", "不同", "SUM"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> articleSource = Arrays.asList("公众号文章", "头条文章"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<String> videoSource = Arrays.asList("公众号视频", "好看视频", "视频号视频", "头条视频", "搜狐视频"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<String> videoSource = Arrays.asList("公众号视频", "好看视频", "视频号视频", "头条视频", "搜狐视频", "票圈视频"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> positionList = Arrays.asList("头条", "次条", "3-8"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (String source : articleSource) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (String same : isSameMiniprogram) { 
			 |