| 
					
				 | 
			
			
				@ -277,26 +277,31 @@ public class ActivityController extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @PostMapping(value = HealthBankMapping.healthBank.pageActivity) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation(value = "分页查询活动") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public PageEnvelop<ActivityDO> pageActivity(@ApiParam(name = "status", value = "活动状态:1上线,2下线") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "status", required = false) String status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "crowdType", value = "人群类型:1:签约居民、2平台用户") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "crowdType", required = false) String crowdType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "releaseTime", value = "下线开始时间") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "releaseTime", required = false) String releaseTime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "activityOfflineTime", value = "下线结束时间") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "activityOfflineTime", required = false) String activityOfflineTime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "filter", value = "活动名、发布机构、面向范围名称") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "filter", required = false) String filter, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "page", value = "第几页,从1开始") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "page", defaultValue = "1", required = false) Integer page, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @ApiParam(name = "size", defaultValue = "10", value = ",每页分页大小") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                               @RequestParam(value = "size", required = false) Integer size) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public PageEnvelop<ActivityDO> pageActivity(@ApiParam(name = "type", value = "活动类型") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "type", required = false) String type, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "status", value = "活动状态:1上线,2下线") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "status", required = false) String status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "crowdType", value = "人群类型:1:签约居民、2平台用户") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "crowdType", required = false) String crowdType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "releaseTime", value = "下线开始时间") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "releaseTime", required = false) String releaseTime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "activityOfflineTime", value = "下线结束时间") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "activityOfflineTime", required = false) String activityOfflineTime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "filter", value = "活动名、发布机构、面向范围名称") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "filter", required = false) String filter, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "page", value = "第几页,从1开始") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "page", defaultValue = "1", required = false) Integer page, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @ApiParam(name = "size", defaultValue = "10", value = ",每页分页大小") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                @RequestParam(value = "size", required = false) Integer size) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            StringBuffer stringBuffer=new StringBuffer(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            stringBuffer.append("delFlag=1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isNotEmpty(type)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("type=").append(type).append(";"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isNotEmpty(filter)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("title?").append(filter).append(" g1;").append("organizer?").append(filter).append(" g1;").append("areaName?").append(filter).append(" g1;"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (null != status && "2".equals(status) ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                stringBuffer.append("status=-1,2;"); 
			 |