| 
					
				 | 
			
			
				@@ -297,26 +297,26 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="countMatchSuccessCount" resultType="java.lang.Long"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select count(content_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from long_articles_text 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where start_processing_time between #{start} and #{end} and result_status = 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from long_articles_new_match_videos 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        where update_time between #{start} and #{end} and content_status = 103 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="getMatchSuccessContentId" resultType="java.lang.String"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from long_articles_text 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where start_processing_time between #{start} and #{end} and result_status = 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from long_articles_new_match_videos 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        where update_time between #{start} and #{end} and content_status = 103 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="countMatchCount" resultType="java.lang.Long"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select count(content_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from long_articles_text 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where start_processing_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from long_articles_new_match_videos 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        where update_time between #{start} and #{end} and content_status in (103, 201, 202, 203) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="getMatchContentId" resultType="java.lang.String"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from long_articles_text 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where start_processing_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from long_articles_new_match_videos 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        where update_time between #{start} and #{end} and content_status in (103, 201, 202, 203) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="getPassContentIds" resultType="java.lang.String"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -393,16 +393,16 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             resultType="com.tzld.longarticle.recommend.server.model.vo.CategoryGroupFunnelExport"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         select success.category, success.cnt as matchSuccessCount, total.cnt as matchCount 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from (select ac.category, count(1) as cnt 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              from long_articles_text lat 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                       join article_category ac on lat.content_id = ac.produce_content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              where lat.start_processing_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                and lat.result_status = 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              from long_articles_new_match_videos lanmv 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+               join article_category ac on lanmv.content_id = ac.produce_content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              where lanmv.update_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                and lanmv.content_status = 103 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               group by ac.category) success 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join (select ac.category, count(1) as cnt 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                   from long_articles_text lat 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            join article_category ac on lat.content_id = ac.produce_content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                   where lat.start_processing_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                     and lat.result_status in (1, 2) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                   from long_articles_new_match_videos lanmv 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    join article_category ac on lanmv.content_id = ac.produce_content_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                   where lanmv.update_time between #{start} and #{end} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                     and lanmv.content_status in (103, 201, 202, 203) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    group by ac.category) total on total.category = success.category 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |