From 259f95deb2ea38287d488d12060d7600c36cd92a Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 17:00:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java | 223 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 157 insertions(+), 66 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java
index 4b1904d..171201f 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java
+++ b/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();
}
}
--
Gitblit v1.9.1