| 
						
						
							
								
							
						
						
					 | 
					@ -36,6 +36,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    private OrgRankExtractService orgRankExtractService; | 
					 | 
					 | 
					    private OrgRankExtractService orgRankExtractService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Autowired | 
					 | 
					 | 
					    @Autowired | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    private GovernRankDataExtractService governRankDataExtractService; | 
					 | 
					 | 
					    private GovernRankDataExtractService governRankDataExtractService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    @Autowired | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @param extractOriginFormDTO | 
					 | 
					 | 
					     * @param extractOriginFormDTO | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -108,10 +110,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * @date 2020/9/24 10:16 上午 | 
					 | 
					 | 
					     * @date 2020/9/24 10:16 上午 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public void extractDaily(String customerId, String dateId) { | 
					 | 
					 | 
					    public void extractDaily(String customerId, String dateId) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					//        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
 | 
					 | 
					 | 
					        //党员基本情况
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //先锋模范
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        pioneerDataExtractService.extractGridPioneerData(customerId, dateId); | 
					 | 
					 | 
					        pioneerDataExtractService.extractGridPioneerData(customerId, dateId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId); | 
					 | 
					 | 
					        pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId); | 
					 | 
					 | 
					        pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //公众参与排行(注册人数、参与人数、话题数、议题数、项目数)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -124,6 +130,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        formDTO.setCustomerId(customerId); | 
					 | 
					 | 
					        formDTO.setCustomerId(customerId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        formDTO.setMonthId(monthId); | 
					 | 
					 | 
					        formDTO.setMonthId(monthId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //基层治理-公众参与screen_user_join
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        publicPartExtractService.extractTotalDataMonthly(formDTO); | 
					 | 
					 | 
					        publicPartExtractService.extractTotalDataMonthly(formDTO); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //治理能力排行
 | 
					 | 
					 | 
					        //治理能力排行
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        governRankDataExtractService.extractGridData(customerId, monthId); | 
					 | 
					 | 
					        governRankDataExtractService.extractGridData(customerId, monthId); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |