| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -44,6 +44,7 @@ import com.epmet.feign.OperCustomizeFeignClient; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.redis.CustomerRedis; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.service.CustomerService; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.github.pagehelper.PageHelper; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.github.pagehelper.PageInfo; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.apache.commons.lang3.StringUtils; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.slf4j.Logger; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.slf4j.LoggerFactory; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -400,12 +401,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    @Override | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    public PageData pageQuery(PageQueryFormDTO formDTO) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        //1:查询有效客户数据(不区分是否在有效期内)
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        PageData resultDTO = new PageData(list,total); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        return resultDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        PageInfo<CustomerResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                .doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName())); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					//        List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					//        //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					//        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        return new PageData(pageInfo.getList(),pageInfo.getTotal()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    /** | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |