diff --git a/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java b/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java index 247cba5..8e24836 100644 --- a/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java +++ b/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java @@ -2,17 +2,23 @@ package com.czsj.common.core.domain; import java.io.Serializable; import java.util.Date; -import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.czsj.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; /** * Entity基类 * * @author czsj */ +@Data public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -21,19 +27,32 @@ public class BaseEntity implements Serializable @JsonIgnore private String searchValue; - /** 创建者 */ - private String createBy; + /** 有效标识,0有效,1无效 */ + @TableLogic(value = "0",delval = "1") + @Excel(name = "有效标识,0有效,1无效") + public Integer isDeleted; + + /** 创建人ID */ + @TableField(fill = FieldFill.INSERT) + @Excel(name = "创建人ID") + public String createBy; + + /** 修改人ID */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Excel(name = "修改人ID") + public String updateBy; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** 更新者 */ - private String updateBy; + @TableField(fill = FieldFill.INSERT) + @Excel(name = "创建时间") + public Date createTime; /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + @Excel(name = "修改时间") + public Date updateTime; /** 备注 */ private String remark; @@ -42,77 +61,5 @@ public class BaseEntity implements Serializable @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; - public String getSearchValue() - { - return searchValue; - } - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public Map getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map params) - { - this.params = params; - } }