| 
						
						
							
								
							
						
						
					 | 
					@ -3,6 +3,7 @@ package com.epmet.service.impl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.StrConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.exception.ExceptionUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.exception.ExceptionUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.exception.RenException; | 
					 | 
					 | 
					import com.epmet.commons.tools.exception.RenException; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.DateUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.DateUtils; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -252,7 +253,8 @@ public class StatsUserServiceImpl implements StatsUserService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    m.setSourceType("external"); | 
					 | 
					 | 
					                    m.setSourceType("external"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    m.setParentCustomerId(crm.getParentCustomerId()); | 
					 | 
					 | 
					                    m.setParentCustomerId(crm.getParentCustomerId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    m.setPid(pid.toString()); | 
					 | 
					 | 
					                    m.setPid(pid.toString()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                    m.setPids(pids.toString()); | 
					 | 
					 | 
					                    //20220214 上报数据的pids是从街道开始,需要在前边拼接上平阴县的id才能保证后续的查询用like时可以筛选出数据  sun
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    m.setPids(StrConstant.PY_ROOT_AGENCY + ":" + pids.toString()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } else { | 
					 | 
					 | 
					                } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    log.warn(String.format("网格员数据分析上报,数据错误,根据agencyId未查询到组织信息,客户Id->%s,组织Id->%s", m.getCustomerId(), m.getAgencyId())); | 
					 | 
					 | 
					                    log.warn(String.format("网格员数据分析上报,数据错误,根据agencyId未查询到组织信息,客户Id->%s,组织Id->%s", m.getCustomerId(), m.getAgencyId())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    iterator.remove(); | 
					 | 
					 | 
					                    iterator.remove(); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |