| 
						
						
							
								
							
						
						
					 | 
					@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.exception.RenException; | 
					 | 
					 | 
					import com.epmet.commons.tools.exception.RenException; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.ConvertUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.ConvertUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.DateUtils; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.CustomerGridStaffListFormDTO; | 
					 | 
					 | 
					import com.epmet.dto.form.CustomerGridStaffListFormDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.GridStaffUploadtFormDTO; | 
					 | 
					 | 
					import com.epmet.dto.form.GridStaffUploadtFormDTO; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -21,6 +20,7 @@ import com.epmet.opendata.entity.GridstaffInfoPingyinEntity; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.opendata.service.GridstaffInfoPingyinService; | 
					 | 
					 | 
					import com.epmet.opendata.service.GridstaffInfoPingyinService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import lombok.extern.slf4j.Slf4j; | 
					 | 
					 | 
					import lombok.extern.slf4j.Slf4j; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.commons.collections4.CollectionUtils; | 
					 | 
					 | 
					import org.apache.commons.collections4.CollectionUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import org.apache.commons.lang3.StringUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.transaction.annotation.Transactional; | 
					 | 
					 | 
					import org.springframework.transaction.annotation.Transactional; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -130,6 +130,10 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            entity.setLeaveDate(r.getLeaveDate()); | 
					 | 
					 | 
					            entity.setLeaveDate(r.getLeaveDate()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            entity.setGridUserId(r.getStaffId()); | 
					 | 
					 | 
					            entity.setGridUserId(r.getStaffId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            entity.setCardNum(r.getIdCard()); | 
					 | 
					 | 
					            entity.setCardNum(r.getIdCard()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            if (StringUtils.isNotBlank(r.getIdCard())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                log.warn("getStaffBaseInfo 身份证号是空的,{}", JSON.toJSONString(entity)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                return; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //按网格查询人员是否存在,存在更新否则新增
 | 
					 | 
					 | 
					            //按网格查询人员是否存在,存在更新否则新增
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId()); | 
					 | 
					 | 
					            GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            log.info(String.format("网格工作人员信息同步,当前操作人员信息,姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId())); | 
					 | 
					 | 
					            log.info(String.format("网格工作人员信息同步,当前操作人员信息,姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId())); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |