| 
						
						
							
								
							
						
						
					 | 
					@ -765,6 +765,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            log.info("阶段性胜利3:"+ JSON.toJSONString(haveDemandList)); | 
					 | 
					 | 
					            log.info("阶段性胜利3:"+ JSON.toJSONString(haveDemandList)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            Map<String, CategoryAnalysisDTO> map = haveDemandList.stream().filter(temp -> CollectionUtils.isNotEmpty(temp.getDetail())).collect(Collectors.toMap(CategoryAnalysisDTO::getCategoryCode, dto -> dto)); | 
					 | 
					 | 
					            Map<String, CategoryAnalysisDTO> map = haveDemandList.stream().filter(temp -> CollectionUtils.isNotEmpty(temp.getDetail())).collect(Collectors.toMap(CategoryAnalysisDTO::getCategoryCode, dto -> dto)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            if(MapUtils.isNotEmpty(map)){ | 
					 | 
					 | 
					            if(MapUtils.isNotEmpty(map)){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                log.info("阶段性胜利4:"+ JSON.toJSONString(map)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                for(CategoryAnalysisDTO result:list){ | 
					 | 
					 | 
					                for(CategoryAnalysisDTO result:list){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (map.containsKey(result.getCategoryCode()) && null != map.get(result.getCategoryCode())) { | 
					 | 
					 | 
					                    if (map.containsKey(result.getCategoryCode()) && null != map.get(result.getCategoryCode())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        //如果当前分类下有上报的需求,将原来的0改为实际的需求数量
 | 
					 | 
					 | 
					                        //如果当前分类下有上报的需求,将原来的0改为实际的需求数量
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -807,6 +808,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            CategoryAnalysisDetail d = ConvertUtils.sourceToTarget(legendDTO, CategoryAnalysisDetail.class); | 
					 | 
					 | 
					            CategoryAnalysisDetail d = ConvertUtils.sourceToTarget(legendDTO, CategoryAnalysisDetail.class); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            d.setServiceDemandTotal(NumConstant.ZERO); | 
					 | 
					 | 
					            d.setServiceDemandTotal(NumConstant.ZERO); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            d.setTotalService(NumConstant.ZERO); | 
					 | 
					 | 
					            d.setTotalService(NumConstant.ZERO); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            l.add(d); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        }); | 
					 | 
					 | 
					        }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return l; | 
					 | 
					 | 
					        return l; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |