| 
						
						
							
								
							
						
						
					 | 
					@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
					 | 
					 | 
					import org.springframework.stereotype.Service; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.util.CollectionUtils; | 
					 | 
					 | 
					import org.springframework.util.CollectionUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import java.math.BigDecimal; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.*; | 
					 | 
					 | 
					import java.util.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.stream.Collectors; | 
					 | 
					 | 
					import java.util.stream.Collectors; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -83,10 +84,17 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
												meta.setProjectCreateTime(projectInfo.getCreatedTime()); | 
					 | 
					 | 
												meta.setProjectCreateTime(projectInfo.getCreatedTime()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
												meta.setProjectTitle(projectInfo.getTitle()); | 
					 | 
					 | 
												meta.setProjectTitle(projectInfo.getTitle()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
												meta.setOrigin(projectInfo.getOrigin()); | 
					 | 
					 | 
												meta.setOrigin(projectInfo.getOrigin()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
												//直接立项的话 项目内容是项目背景
 | 
					 | 
					 | 
												//直接立项的话 项目内容是项目背景 经纬度添加
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
												if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){ | 
					 | 
					 | 
												if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
													meta.setProjectContent(projectInfo.getBackGround()); | 
					 | 
					 | 
													meta.setProjectContent(projectInfo.getBackGround()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
													meta.setLinkName(projectInfo.getCreatedBy()); | 
					 | 
					 | 
													meta.setLinkName(projectInfo.getCreatedBy()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
													if (StringUtils.isNotBlank(projectInfo.getLocateDimension())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
														meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
													} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
													if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
														meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
													} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
													meta.setProjectAddress(projectInfo.getLocateAddress()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
												} | 
					 | 
					 | 
												} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
												return meta; | 
					 | 
					 | 
												return meta; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									})).collect(Collectors.toList()); | 
					 | 
					 | 
									})).collect(Collectors.toList()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |