From 0727355ae017c0153ee7c643cdd1b0611c81627f Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 12:04:00 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 256 +++++++++++++++++++++++++-------------------------
1 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
index 69cd4b5..63f5395 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
@@ -18,47 +18,47 @@
/**
* 璁块棶浜嬩欢涓婚敭
*/
- public static final String id = "id";
- /**
- * 璁块棶浜哄憳涓婚敭
- */
- public static final String visitorPersonId = "visitorPersonId";
- /**
- * 琚闂汉鍛樹富閿�
- */
- public static final String visiteePersonId = "visiteePersonId";
+ public static final String visitId = "visitId";
/**
* 璁块棶浜嬬敱涓婚敭
*/
- public static final String matterId = "matterId";
+ public static final String visitReasonId = "visitReasonId";
/**
* 璁块棶澶囨敞
*/
public static final String remark = "remark";
/**
- * 鏈�鏂扮殑璁块棶鐘舵��
- */
- public static final String lastStatus = "lastStatus";
- /**
* 鏉ヨ鏃堕棿
*/
- public static final String startTime = "startTime";
+ public static final String enterTime = "enterTime";
/**
* 绛剧鏃堕棿
*/
- public static final String lastTime = "lastTime";
+ public static final String exitTime = "exitTime";
+ /**
+ * 璁垮绫诲瀷
+ */
+ public static final String visitorTypeId = "visitorTypeId";
+ /**
+ * 璁块棶浜哄憳涓婚敭
+ */
+ public static final String visitorId = "visitorId";
/**
* visitorCompanyId
*/
public static final String visitorCompanyId = "visitorCompanyId";
/**
+ * 琚闂汉鍛樹富閿�
+ */
+ public static final String visiteeId = "visiteeId";
+ /**
* visiteeCompanyId
*/
public static final String visiteeCompanyId = "visiteeCompanyId";
/**
- * 璁垮绫诲瀷
+ * 鏈�鏂扮殑璁块棶鐘舵��
*/
- public static final String visitorTypeId = "visitorTypeId";
+ public static final String currentStateId = "currentStateId";
/**
* 褰撳墠璁块棶鐨勮鍛婄姸鎬�
*/
@@ -66,84 +66,56 @@
}
// 璁块棶浜嬩欢涓婚敭
- private Integer id;
- // 璁块棶浜哄憳涓婚敭
- private Integer visitorPersonId;
- // 琚闂汉鍛樹富閿�
- private Integer visiteePersonId;
+ private String visitId;
// 璁块棶浜嬬敱涓婚敭
- private Integer matterId;
+ private String visitReasonId;
// 璁块棶澶囨敞
private String remark;
- // 鏈�鏂扮殑璁块棶鐘舵��
- private Integer lastStatus;
// 鏉ヨ鏃堕棿
- private Date startTime;
+ private String enterTime;
// 绛剧鏃堕棿
- private Date lastTime;
- // visitorCompanyId
- private Integer visitorCompanyId;
- // visiteeCompanyId
- private Integer visiteeCompanyId;
+ private String exitTime;
// 璁垮绫诲瀷
- private Integer visitorTypeId;
+ private String visitorTypeId;
+ // 璁块棶浜哄憳涓婚敭
+ private String visitorId;
+ // visitorCompanyId
+ private String visitorCompanyId;
+ // 琚闂汉鍛樹富閿�
+ private String visiteeId;
+ // visiteeCompanyId
+ private String visiteeCompanyId;
+ // 鏈�鏂扮殑璁块棶鐘舵��
+ private String currentStateId;
// 褰撳墠璁块棶鐨勮鍛婄姸鎬�
- private Integer warning;
+ private String warning;
/**
* Get 璁块棶浜嬩欢涓婚敭
*/
- public Integer getId() {
- return id;
+ public String getVisitId() {
+ return visitId;
}
/**
* Set 璁块棶浜嬩欢涓婚敭
*/
- public void setId(Integer id) {
- this.id = id;
- }
-
- /**
- * Get 璁块棶浜哄憳涓婚敭
- */
- public Integer getVisitorPersonId() {
- return visitorPersonId;
- }
-
- /**
- * Set 璁块棶浜哄憳涓婚敭
- */
- public void setVisitorPersonId(Integer visitorPersonId) {
- this.visitorPersonId = visitorPersonId;
- }
-
- /**
- * Get 琚闂汉鍛樹富閿�
- */
- public Integer getVisiteePersonId() {
- return visiteePersonId;
- }
-
- /**
- * Set 琚闂汉鍛樹富閿�
- */
- public void setVisiteePersonId(Integer visiteePersonId) {
- this.visiteePersonId = visiteePersonId;
+ public void setVisitId(String visitId) {
+ this.visitId = visitId;
}
/**
* Get 璁块棶浜嬬敱涓婚敭
*/
- public Integer getMatterId() {
- return matterId;
+ public String getVisitReasonId() {
+ return visitReasonId;
}
/**
* Set 璁块棶浜嬬敱涓婚敭
*/
- public void setMatterId(Integer matterId) {
- this.matterId = matterId;
+ public void setVisitReasonId(String visitReasonId) {
+ this.visitReasonId = visitReasonId;
}
/**
@@ -161,109 +133,137 @@
}
/**
- * Get 鏈�鏂扮殑璁块棶鐘舵��
- */
- public Integer getLastStatus() {
- return lastStatus;
- }
-
- /**
- * Set 鏈�鏂扮殑璁块棶鐘舵��
- */
- public void setLastStatus(Integer lastStatus) {
- this.lastStatus = lastStatus;
- }
-
- /**
* Get 鏉ヨ鏃堕棿
*/
- public Date getStartTime() {
- return startTime;
+ public String getEnterTime() {
+ return enterTime;
}
/**
* Set 鏉ヨ鏃堕棿
*/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
+ public void setEnterTime(String enterTime) {
+ this.enterTime = enterTime;
}
/**
* Get 绛剧鏃堕棿
*/
- public Date getLastTime() {
- return lastTime;
+ public String getExitTime() {
+ return exitTime;
}
/**
* Set 绛剧鏃堕棿
*/
- public void setLastTime(Date lastTime) {
- this.lastTime = lastTime;
- }
-
- /**
- * Get visitorCompanyId
- */
- public Integer getVisitorCompanyId() {
- return visitorCompanyId;
- }
-
- /**
- * Set visitorCompanyId
- */
- public void setVisitorCompanyId(Integer visitorCompanyId) {
- this.visitorCompanyId = visitorCompanyId;
- }
-
- /**
- * Get visiteeCompanyId
- */
- public Integer getVisiteeCompanyId() {
- return visiteeCompanyId;
- }
-
- /**
- * Set visiteeCompanyId
- */
- public void setVisiteeCompanyId(Integer visiteeCompanyId) {
- this.visiteeCompanyId = visiteeCompanyId;
+ public void setExitTime(String exitTime) {
+ this.exitTime = exitTime;
}
/**
* Get 璁垮绫诲瀷
*/
- public Integer getVisitorTypeId() {
+ public String getVisitorTypeId() {
return visitorTypeId;
}
/**
* Set 璁垮绫诲瀷
*/
- public void setVisitorTypeId(Integer visitorTypeId) {
+ public void setVisitorTypeId(String visitorTypeId) {
this.visitorTypeId = visitorTypeId;
+ }
+
+ /**
+ * Get 璁块棶浜哄憳涓婚敭
+ */
+ public String getVisitorId() {
+ return visitorId;
+ }
+
+ /**
+ * Set 璁块棶浜哄憳涓婚敭
+ */
+ public void setVisitorId(String visitorId) {
+ this.visitorId = visitorId;
+ }
+
+ /**
+ * Get visitorCompanyId
+ */
+ public String getVisitorCompanyId() {
+ return visitorCompanyId;
+ }
+
+ /**
+ * Set visitorCompanyId
+ */
+ public void setVisitorCompanyId(String visitorCompanyId) {
+ this.visitorCompanyId = visitorCompanyId;
+ }
+
+ /**
+ * Get 琚闂汉鍛樹富閿�
+ */
+ public String getVisiteeId() {
+ return visiteeId;
+ }
+
+ /**
+ * Set 琚闂汉鍛樹富閿�
+ */
+ public void setVisiteeId(String visiteeId) {
+ this.visiteeId = visiteeId;
+ }
+
+ /**
+ * Get visiteeCompanyId
+ */
+ public String getVisiteeCompanyId() {
+ return visiteeCompanyId;
+ }
+
+ /**
+ * Set visiteeCompanyId
+ */
+ public void setVisiteeCompanyId(String visiteeCompanyId) {
+ this.visiteeCompanyId = visiteeCompanyId;
+ }
+
+ /**
+ * Get 鏈�鏂扮殑璁块棶鐘舵��
+ */
+ public String getCurrentStateId() {
+ return currentStateId;
+ }
+
+ /**
+ * Set 鏈�鏂扮殑璁块棶鐘舵��
+ */
+ public void setCurrentStateId(String currentStateId) {
+ this.currentStateId = currentStateId;
}
/**
* Get 褰撳墠璁块棶鐨勮鍛婄姸鎬�
*/
- public Integer getWarning() {
+ public String getWarning() {
return warning;
}
/**
* Set 褰撳墠璁块棶鐨勮鍛婄姸鎬�
*/
- public void setWarning(Integer warning) {
+ public void setWarning(String warning) {
this.warning = warning;
}
public String toString() {
return
- ",璁块棶浜嬩欢涓婚敭 ="+ id + ",璁块棶浜哄憳涓婚敭 ="+ visitorPersonId + ",琚闂汉鍛樹富閿� ="+ visiteePersonId +
- ",璁块棶浜嬬敱涓婚敭 ="+ matterId + ",璁块棶澶囨敞 =" + remark + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ lastStatus +
- ",鏉ヨ鏃堕棿 =" + startTime + ",绛剧鏃堕棿 =" + lastTime + ",visitorCompanyId ="+ visitorCompanyId +
- ",visiteeCompanyId ="+ visiteeCompanyId + ",璁垮绫诲瀷 =" + visitorTypeId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning
+ ",璁块棶浜嬩欢涓婚敭 ="+ visitId + ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId + ",璁块棶澶囨敞 =" + remark +
+ ",鏉ヨ鏃堕棿 =" + enterTime + ",绛剧鏃堕棿 =" + exitTime + ",璁垮绫诲瀷 =" + visitorTypeId +
+ ",璁块棶浜哄憳涓婚敭 ="+ visitorId + ",visitorCompanyId ="+ visitorCompanyId + ",琚闂汉鍛樹富閿� ="+ visiteeId +
+ ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning
;
}
}
--
Gitblit v1.8.0