| 
						
						
							
								
							
						
						
					 | 
					@ -199,6 +199,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        for(UserSubAgencyResultDTO m:dimList){ | 
					 | 
					 | 
					        for(UserSubAgencyResultDTO m:dimList){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            logger.info("机关名:"+m.getName()+",总数="+m.getTotal()); | 
					 | 
					 | 
					            logger.info("机关名:"+m.getName()+",总数="+m.getTotal()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  start
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            dimList.forEach(d->{ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                if("热心居民".equals(d.getType())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    d.setType("网格员"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  end
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return dimList; | 
					 | 
					 | 
					        return dimList; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -323,6 +332,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        for(UserSubGridResultDTO m:dimList){ | 
					 | 
					 | 
					        for(UserSubGridResultDTO m:dimList){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            logger.info("网格名:"+m.getName()+",总数="+m.getTotal()); | 
					 | 
					 | 
					            logger.info("网格名:"+m.getName()+",总数="+m.getTotal()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  start
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            dimList.forEach(d->{ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                if("热心居民".equals(d.getType())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    d.setType("网格员"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  end
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return dimList; | 
					 | 
					 | 
					        return dimList; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -488,6 +506,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            party.setValue(userIncrTrendResDTO.getPartymemberIncr()); | 
					 | 
					 | 
					            party.setValue(userIncrTrendResDTO.getPartymemberIncr()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            resultList.add(party); | 
					 | 
					 | 
					            resultList.add(party); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  start
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            resultList.forEach(d->{ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                if("热心居民".equals(d.getType())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    d.setType("网格员"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        //2021.5.25  平音客户热心居民改网格员  sun  end
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return resultList; | 
					 | 
					 | 
					        return resultList; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |