|  | @ -36,13 +36,14 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |     @Column(name = "img")
 | 
	
		
			
				|  |  |     private String img;//活动图片
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "start_time")
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "registration_time")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     private Date startTime;//开始时间
 | 
	
		
			
				|  |  |     private Date registrationTime;//报名时间
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "end_time")
 | 
	
		
			
				|  |  |     @Column(name = "activity_offline_time")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     private Date endTime; //结束时间
 | 
	
		
			
				|  |  |     private Date activityOfflineTime; //活动下线时间
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "status")
 | 
	
		
			
				|  |  |     private Integer status;//状态(1代表有效,0代表无效,-1代表过期)
 | 
	
	
		
			
				|  | @ -62,6 +63,30 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |     @Column(name = "type")
 | 
	
		
			
				|  |  |     private String type;//活动类型
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "dead_line")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     private Date deadLine;//参与截止时间
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "crowd_type")
 | 
	
		
			
				|  |  |     private Integer crowdType;//面向人群
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "recommended")
 | 
	
		
			
				|  |  |     private Integer recommended;//是否推荐
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "info")
 | 
	
		
			
				|  |  |     private String info;//报名信息
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name="limit_register")
 | 
	
		
			
				|  |  |     private Integer limitRegister;//报名限制 0、所有居民可以报名,1、仅当前居民账号可报名
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "count")
 | 
	
		
			
				|  |  |     private Long count;//报名人数
 | 
	
		
			
				|  |  | /*
 | 
	
		
			
				|  |  |     @Column(name = "del")
 | 
	
		
			
				|  |  |     private Integer del;//1有效0无效*/
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Transient
 | 
	
		
			
				|  |  |     private String patientId;//居民id
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -89,6 +114,11 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |     @Transient
 | 
	
		
			
				|  |  |     private Long sum;//活动积分总数
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Transient
 | 
	
		
			
				|  |  |     private ActivityRuleDO activityRuleDO;//活动规则
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "saas_id")
 | 
	
		
			
				|  |  |     public String getSaasId() {
 | 
	
		
			
				|  |  |         return saasId;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -97,6 +127,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.saasId = saasId;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "organizer")
 | 
	
		
			
				|  |  |     public String getOrganizer() {
 | 
	
		
			
				|  |  |         return organizer;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -105,6 +136,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.organizer = organizer;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "title")
 | 
	
		
			
				|  |  |     public String getTitle() {
 | 
	
		
			
				|  |  |         return title;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -113,6 +145,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.title = title;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "description")
 | 
	
		
			
				|  |  |     public String getDescription() {
 | 
	
		
			
				|  |  |         return description;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -121,6 +154,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.description = description;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "location")
 | 
	
		
			
				|  |  |     public String getLocation() {
 | 
	
		
			
				|  |  |         return location;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -129,6 +163,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.location = location;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "img")
 | 
	
		
			
				|  |  |     public String getImg() {
 | 
	
		
			
				|  |  |         return img;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -137,15 +172,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.img = img;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public Date getStartTime() {
 | 
	
		
			
				|  |  |         return startTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setStartTime(Date startTime) {
 | 
	
		
			
				|  |  |         this.startTime = startTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "status")
 | 
	
		
			
				|  |  |     public Integer getStatus() {
 | 
	
		
			
				|  |  |         return status;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -154,6 +181,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.status = status;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "is_flag")
 | 
	
		
			
				|  |  |     public Integer getIsFlag() {
 | 
	
		
			
				|  |  |         return isFlag;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -162,6 +190,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.isFlag = isFlag;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "remark")
 | 
	
		
			
				|  |  |     public String getRemark() {
 | 
	
		
			
				|  |  |         return remark;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -170,14 +199,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.remark = remark;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public Date getEndTime() {
 | 
	
		
			
				|  |  |         return endTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setEndTime(Date endTime) {
 | 
	
		
			
				|  |  |         this.endTime = endTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "area")
 | 
	
		
			
				|  |  |     public String getArea() {
 | 
	
		
			
				|  |  |         return area;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -221,6 +243,7 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |         this.total = total;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "type")
 | 
	
		
			
				|  |  |     public String getType() {
 | 
	
		
			
				|  |  |         return type;
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -282,4 +305,99 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
 | 
	
		
			
				|  |  |     public void setTaskDOS(List<TaskDO> taskDOS) {
 | 
	
		
			
				|  |  |         this.taskDOS = taskDOS;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "registration_time")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     public Date getRegistrationTime() {
 | 
	
		
			
				|  |  |         return registrationTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setRegistrationTime(Date registrationTime) {
 | 
	
		
			
				|  |  |         this.registrationTime = registrationTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "activity_offline_time")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     public Date getActivityOfflineTime() {
 | 
	
		
			
				|  |  |         return activityOfflineTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setActivityOfflineTime(Date activityOfflineTime) {
 | 
	
		
			
				|  |  |         this.activityOfflineTime = activityOfflineTime;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "dead_line")
 | 
	
		
			
				|  |  |     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 | 
	
		
			
				|  |  |     public Date getDeadLine() {
 | 
	
		
			
				|  |  |         return deadLine;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setDeadLine(Date deadLine) {
 | 
	
		
			
				|  |  |         this.deadLine = deadLine;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "crowd_type")
 | 
	
		
			
				|  |  |     public Integer getCrowdType() {
 | 
	
		
			
				|  |  |         return crowdType;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setCrowdType(Integer crowdType) {
 | 
	
		
			
				|  |  |         this.crowdType = crowdType;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "recommended")
 | 
	
		
			
				|  |  |     public Integer getRecommended() {
 | 
	
		
			
				|  |  |         return recommended;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setRecommended(Integer recommended) {
 | 
	
		
			
				|  |  |         this.recommended = recommended;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "info")
 | 
	
		
			
				|  |  |     public String getInfo() {
 | 
	
		
			
				|  |  |         return info;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setInfo(String info) {
 | 
	
		
			
				|  |  |         this.info = info;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name = "count")
 | 
	
		
			
				|  |  |     public Long getCount() {
 | 
	
		
			
				|  |  |         return count;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setCount(Long count) {
 | 
	
		
			
				|  |  |         this.count = count;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Transient
 | 
	
		
			
				|  |  |     public ActivityRuleDO getActivityRuleDO() {
 | 
	
		
			
				|  |  |         return activityRuleDO;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setActivityRuleDO(ActivityRuleDO activityRuleDO) {
 | 
	
		
			
				|  |  |         this.activityRuleDO = activityRuleDO;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @Column(name="limit_register")
 | 
	
		
			
				|  |  |     public Integer getLimitRegister() {
 | 
	
		
			
				|  |  |         return limitRegister;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setLimitRegister(Integer limitRegister) {
 | 
	
		
			
				|  |  |         this.limitRegister = limitRegister;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | /*
 | 
	
		
			
				|  |  |     @Column(name = "del")
 | 
	
		
			
				|  |  |     public Integer getDel() {
 | 
	
		
			
				|  |  |         return del;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public void setDel(Integer del) {
 | 
	
		
			
				|  |  |         this.del = del;
 | 
	
		
			
				|  |  |     }*/
 | 
	
		
			
				|  |  | }
 |