fanli-server.git

			@@ -2,16 +2,9 @@

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;

			import javax.persistence.Column;
			import javax.persistence.Entity;
			import javax.persistence.GeneratedValue;
			import javax.persistence.GenerationType;
			import javax.persistence.Id;
			import javax.persistence.JoinColumn;
			import javax.persistence.Table;
			import javax.persistence.Transient;
			import org.yeshi.utils.mybatis.Column;
			import org.yeshi.utils.mybatis.Table;

			/**
			* 专题标识管理
			@@ -20,51 +13,63 @@
			*
			* @date 2018年10月23日
			*/
			@Entity
			@Table(name = "yeshi_ec_special_card")
			@org.yeshi.utils.mybatis.Table("yeshi_ec_special_card")
			@Table("yeshi_ec_special_card")
			public class SpecialCard implements Serializable{

			private static final long serialVersionUID = 1L;


			@Id
			@Column(name = "cd_id")
			@GeneratedValue(strategy = GenerationType.AUTO)
			@org.yeshi.utils.mybatis.Column(name = "cd_id")
			private Long id;

			// 名称
			@JoinColumn(name = "cd_name")
			@org.yeshi.utils.mybatis.Column(name = "cd_name")
			@Column(name = "cd_name")
			private String name;

			// 匹配标识
			@JoinColumn(name = "cd_card")
			@org.yeshi.utils.mybatis.Column(name = "cd_card")
			// 匹配标识 (已停用：兼容1.5.3 以前版本-暂保留)
			@Column(name = "cd_card")
			private String card;

			// 匹配标识
			@JoinColumn(name = "cd_state")
			@org.yeshi.utils.mybatis.Column(name = "cd_state")
			// 匹配标识
			@Column(name = "cd_state")
			private Integer state;

			// 位置管理id
			@Column(name = "cd_place_id")
			private Long placeId;

			// 背景图片
			@Column(name = "cd_bottom_picture")
			private String bottomPicture;

			//起始时间
			@Column(name = "cd_start_time")
			private Date startTime;

			//结束时间
			@Column(name = "cd_end_time")
			private Date endTime;

			// 创建时间
			@JoinColumn(name = "cd_createtime")
			@org.yeshi.utils.mybatis.Column(name = "cd_createtime")
			@Column(name = "cd_createtime")
			private Date createtime;

			// 更新时间（修改时间）
			@JoinColumn(name = "cd_updatetime")
			@org.yeshi.utils.mybatis.Column(name = "cd_updatetime")
			@Column(name = "cd_updatetime")
			private Date updatetime;

			@Transient

			// 是否定时
			private boolean timeTask;
			// 起始时间
			private String startTime_str;
			// 结束时间
			private String endTime_str;
			// 位置名称
			private String placeName;
			// 已有专题数量
			private Long totalSpecial;

			@Transient // 系统关联列表
			private List<com.yeshi.fanli.entity.system.System> systemList;

			// 删除背景图
			private Boolean delPicture;


			public Long getId() {
			@@ -107,14 +112,6 @@
			this.updatetime = updatetime;
			}

			public List<com.yeshi.fanli.entity.system.System> getSystemList() {
			return systemList;
			}

			public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {
			this.systemList = systemList;
			}

			public Long getTotalSpecial() {
			return totalSpecial;
			}
			@@ -129,6 +126,78 @@

			public void setState(Integer state) {
			this.state = state;
			}

			public Long getPlaceId() {
			return placeId;
			}

			public void setPlaceId(Long placeId) {
			this.placeId = placeId;
			}

			public String getBottomPicture() {
			return bottomPicture;
			}

			public void setBottomPicture(String bottomPicture) {
			this.bottomPicture = bottomPicture;
			}

			public Date getStartTime() {
			return startTime;
			}

			public void setStartTime(Date startTime) {
			this.startTime = startTime;
			}

			public Date getEndTime() {
			return endTime;
			}

			public void setEndTime(Date endTime) {
			this.endTime = endTime;
			}

			public boolean isTimeTask() {
			return timeTask;
			}

			public void setTimeTask(boolean timeTask) {
			this.timeTask = timeTask;
			}

			public String getStartTime_str() {
			return startTime_str;
			}

			public void setStartTime_str(String startTime_str) {
			this.startTime_str = startTime_str;
			}

			public String getEndTime_str() {
			return endTime_str;
			}

			public void setEndTime_str(String endTime_str) {
			this.endTime_str = endTime_str;
			}

			public String getPlaceName() {
			return placeName;
			}

			public void setPlaceName(String placeName) {
			this.placeName = placeName;
			}

			public Boolean getDelPicture() {
			return delPicture;
			}

			public void setDelPicture(Boolean delPicture) {
			this.delPicture = delPicture;
			}

			}