| 
						
						
							
								
							
						
						
					 | 
					@ -61,11 +61,10 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        customerIds.add(customerId); | 
					 | 
					 | 
					        customerIds.add(customerId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        List<GridAndOrgCategoryCountResultDTO> allList = new ArrayList<>(); | 
					 | 
					 | 
					        List<GridAndOrgCategoryCountResultDTO> allList = new ArrayList<>(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        List<GridAndOrgCategoryCountResultDTO> closedList = new ArrayList<>(); | 
					 | 
					 | 
					        List<GridAndOrgCategoryCountResultDTO> closedList = new ArrayList<>(); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					        if (CollectionUtils.isNotEmpty(relationInfo)){ | 
					 | 
					 | 
					        if (CollectionUtils.isEmpty(relationInfo)){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            // 单客户
 | 
					 | 
					 | 
					            // 单客户
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            allList = screenProjectDataDao.selectGridCategoryProjectCount(customerIds, dateId, ProjectConstant.PROJECT_STATUS_ALL,customerId, NumConstant.FOUR); | 
					 | 
					 | 
					            allList = screenProjectDataDao.selectGridCategoryProjectCount(customerIds, dateId, ProjectConstant.PROJECT_STATUS_ALL,customerId, NumConstant.FOUR); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            closedList = screenProjectDataDao.selectGridCategoryProjectCount(customerIds, dateId, ProjectConstant.PROJECT_STATUS_CLOSED,customerId, NumConstant.FOUR); | 
					 | 
					 | 
					            closedList = screenProjectDataDao.selectGridCategoryProjectCount(customerIds, dateId, ProjectConstant.PROJECT_STATUS_CLOSED,customerId, NumConstant.FOUR); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        }else { | 
					 | 
					 | 
					        }else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            // 多客户
 | 
					 | 
					 | 
					            // 多客户
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            List<String> subCustomerIds = relationInfo.stream().map(CustomerRelationEntity::getCustomerId).collect(Collectors.toList()); | 
					 | 
					 | 
					            List<String> subCustomerIds = relationInfo.stream().map(CustomerRelationEntity::getCustomerId).collect(Collectors.toList()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -118,6 +117,8 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     */ | 
					 | 
					 | 
					     */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public void extractCategoryProjectOrgData(String customerId, String dateId) { | 
					 | 
					 | 
					    public void extractCategoryProjectOrgData(String customerId, String dateId) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					        List<CustomerRelationEntity> relationInfo = relationService.selectSubCustomer(customerId); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        List<String> customerIds = new ArrayList<>(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        customerIds.add(customerId); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
					 | 
					
  |