Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-21 259f95deb2ea38287d488d12060d7600c36cd92a

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java

@@ -5,107 +5,154 @@
import com.javaweb.common.annotation.Excel;
import com.javaweb.common.core.domain.BaseEntity;

import java.util.Date;

/**
 * 项目人员对象 js_project_person
 * 
 *
 * @author cxy
 * @date 2024-05-16
 */
public class ProjectPerson extends BaseEntity
{
public class ProjectPerson extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** id */
    /**
     * id
     */
    private String ids;

    /** 项目id */
    /**
     * 项目id
     */
    private String projectId;

    /** 钻孔id */
    /**
     * 钻孔id
     */
    private String holeId;

    /** 人员名称 */
    /**
     * 人员名称
     */
    @Excel(name = "人员名称")
    private String name;

    /** 类型 */
    /**
     * 类型
     */
    @Excel(name = "类型")
    private String type;

    /** 手机号 */
    /**
     * 手机号
     */
    @Excel(name = "手机号")
    private String phone;

    /** 身份证号 */
    /**
     * 身份证号
     */
    @Excel(name = "身份证号")
    private String idCard;

    /** 人员分组 */
    /**
     * 人员分组
     */
    @Excel(name = "人员分组")
    private String personGroup;

    /** 职责 */
    /**
     * 职责
     */
    @Excel(name = "职责")
    private String responsibility;

    /** 状态 */

    /**
     * 进场时间
     */
    @Excel(name = "进场时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date inSiteTime;

    /**
     * 出场时间
     */
    @Excel(name = "出场时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date outSiteTime;

    /**
     * 证件类型
     */
    @Excel(name = "证件类型")
    private String documentType;

    /**
     * 证件编号
     */
    @Excel(name = "证件编号")
    private String documentCode;

    /**
     * 证件url
     */
    @Excel(name = "证件url")
    private String documentPath;

    /**
     * 状态
     */
    private String status;

    /** 是否删除（0 未删除 1删除） */
    /**
     * 是否删除（0 未删除 1删除）
     */
    private String isDeleted;

    public void setIds(String ids) 
    {
    public void setIds(String ids) {
        this.ids = ids;
    }

    public String getIds() 
    {
    public String getIds() {
        return ids;
    }
    public void setProjectId(String projectId) 
    {

    public void setProjectId(String projectId) {
        this.projectId = projectId;
    }

    public String getProjectId() 
    {
    public String getProjectId() {
        return projectId;
    }
    public void setHoleId(String holeId) 
    {

    public void setHoleId(String holeId) {
        this.holeId = holeId;
    }

    public String getHoleId() 
    {
    public String getHoleId() {
        return holeId;
    }
    public void setName(String name) 
    {

    public void setName(String name) {
        this.name = name;
    }

    public String getName() 
    {
    public String getName() {
        return name;
    }
    public void setType(String type) 
    {

    public void setType(String type) {
        this.type = type;
    }

    public String getType() 
    {
    public String getType() {
        return type;
    }
    public void setPhone(String phone) 
    {

    public void setPhone(String phone) {
        this.phone = phone;
    }

    public String getPhone()
    {
    public String getPhone() {
        return phone;
    }

@@ -125,51 +172,95 @@
        this.personGroup = personGroup;
    }

    public void setResponsibility(String responsibility)
    {
    public void setResponsibility(String responsibility) {
        this.responsibility = responsibility;
    }

    public String getResponsibility() 
    {
    public String getResponsibility() {
        return responsibility;
    }
    public void setStatus(String status) 
    {


    public Date getInSiteTime() {
        return inSiteTime;
    }

    public void setInSiteTime(Date inSiteTime) {
        this.inSiteTime = inSiteTime;
    }

    public void setOutSiteTime(Date outSiteTime) {
        this.outSiteTime = outSiteTime;
    }

    public Date getOutSiteTime() {
        return outSiteTime;
    }

    public void setDocumentType(String documentType) {
        this.documentType = documentType;
    }

    public String getDocumentType() {
        return documentType;
    }

    public void setDocumentCode(String documentCode) {
        this.documentCode = documentCode;
    }

    public String getDocumentCode() {
        return documentCode;
    }

    public void setDocumentPath(String documentPath) {
        this.documentPath = documentPath;
    }

    public String getDocumentPath() {
        return documentPath;
    }


    public void setStatus(String status) {
        this.status = status;
    }

    public String getStatus() 
    {

    public String getStatus() {
        return status;
    }
    public void setIsDeleted(String isDeleted) 
    {

    public void setIsDeleted(String isDeleted) {
        this.isDeleted = isDeleted;
    }

    public String getIsDeleted() 
    {
    public String getIsDeleted() {
        return isDeleted;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("ids", getIds())
            .append("projectId", getProjectId())
            .append("holeId", getHoleId())
            .append("name", getName())
            .append("type", getType())
            .append("phone", getPhone())
            .append("responsibility", getResponsibility())
            .append("status", getStatus())
            .append("isDeleted", getIsDeleted())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("ids", getIds())
                .append("projectId", getProjectId())
                .append("holeId", getHoleId())
                .append("name", getName())
                .append("type", getType())
                .append("phone", getPhone())
                .append("responsibility", getResponsibility())
                .append("inSiteTime", getInSiteTime())
                .append("outSiteTime", getOutSiteTime())
                .append("documentType", getDocumentType())
                .append("documentCode", getDocumentCode())
                .append("documentPath", getDocumentPath())
                .append("status", getStatus())
                .append("isDeleted", getIsDeleted())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("remark", getRemark())
                .toString();
    }
}