From 82399d7ee4a1702c3089f0cca0c579f56f50e543 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 四月 2017 17:49:18 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java |  200 +++++++++++++++++++++++++-------------------------
 1 files changed, 100 insertions(+), 100 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 3412d20..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 String id;
-	// 璁块棶浜哄憳涓婚敭
-	private String visitorPersonId;
-	// 琚闂汉鍛樹富閿�
-	private String visiteePersonId;
+	private String visitId;
 	// 璁块棶浜嬬敱涓婚敭
-	private String matterId;
+	private String visitReasonId;
 	// 璁块棶澶囨敞
 	private String remark;
-	// 鏈�鏂扮殑璁块棶鐘舵��
-	private String lastStatus;
 	// 鏉ヨ鏃堕棿
-	private String startTime;
+	private String enterTime;
 	// 绛剧鏃堕棿
-	private String lastTime;
-	// visitorCompanyId
-	private String visitorCompanyId;
-	// visiteeCompanyId
-	private String visiteeCompanyId;
+	private String exitTime;
 	// 璁垮绫诲瀷
 	private String visitorTypeId;
+	// 璁块棶浜哄憳涓婚敭
+	private String visitorId;
+	// visitorCompanyId
+	private String visitorCompanyId;
+	// 琚闂汉鍛樹富閿�
+	private String visiteeId;
+	// visiteeCompanyId
+	private String visiteeCompanyId;
+	// 鏈�鏂扮殑璁块棶鐘舵��
+	private String currentStateId;
 	// 褰撳墠璁块棶鐨勮鍛婄姸鎬�
 	private String warning;
 
 	/**
 	 * Get 璁块棶浜嬩欢涓婚敭
 	 */
-	public String getId() {
-		return id;
+	public String getVisitId() {
+		return visitId;
 	}
 
 	/**
 	 * Set 璁块棶浜嬩欢涓婚敭
 	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * Get 璁块棶浜哄憳涓婚敭
-	 */
-	public String getVisitorPersonId() {
-		return visitorPersonId;
-	}
-
-	/**
-	 * Set 璁块棶浜哄憳涓婚敭
-	 */
-	public void setVisitorPersonId(String visitorPersonId) {
-		this.visitorPersonId = visitorPersonId;
-	}
-
-	/**
-	 * Get 琚闂汉鍛樹富閿�
-	 */
-	public String getVisiteePersonId() {
-		return visiteePersonId;
-	}
-
-	/**
-	 * Set 琚闂汉鍛樹富閿�
-	 */
-	public void setVisiteePersonId(String visiteePersonId) {
-		this.visiteePersonId = visiteePersonId;
+	public void setVisitId(String visitId) {
+		this.visitId = visitId;
 	}
 
 	/**
 	 * Get 璁块棶浜嬬敱涓婚敭
 	 */
-	public String getMatterId() {
-		return matterId;
+	public String getVisitReasonId() {
+		return visitReasonId;
 	}
 
 	/**
 	 * Set 璁块棶浜嬬敱涓婚敭
 	 */
-	public void setMatterId(String matterId) {
-		this.matterId = matterId;
+	public void setVisitReasonId(String visitReasonId) {
+		this.visitReasonId = visitReasonId;
 	}
 
 	/**
@@ -161,45 +133,59 @@
 	}
 
 	/**
-	 * Get 鏈�鏂扮殑璁块棶鐘舵��
-	 */
-	public String getLastStatus() {
-		return lastStatus;
-	}
-
-	/**
-	 * Set 鏈�鏂扮殑璁块棶鐘舵��
-	 */
-	public void setLastStatus(String lastStatus) {
-		this.lastStatus = lastStatus;
-	}
-
-	/**
 	 * Get 鏉ヨ鏃堕棿
 	 */
-	public String getStartTime() {
-		return startTime;
+	public String getEnterTime() {
+		return enterTime;
 	}
 
 	/**
 	 * Set 鏉ヨ鏃堕棿
 	 */
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
+	public void setEnterTime(String enterTime) {
+		this.enterTime = enterTime;
 	}
 
 	/**
 	 * Get 绛剧鏃堕棿
 	 */
-	public String getLastTime() {
-		return lastTime;
+	public String getExitTime() {
+		return exitTime;
 	}
 
 	/**
 	 * Set 绛剧鏃堕棿
 	 */
-	public void setLastTime(String lastTime) {
-		this.lastTime = lastTime;
+	public void setExitTime(String exitTime) {
+		this.exitTime = exitTime;
+	}
+
+	/**
+	 * Get 璁垮绫诲瀷
+	 */
+	public String getVisitorTypeId() {
+		return visitorTypeId;
+	}
+
+	/**
+	 * Set 璁垮绫诲瀷
+	 */
+	public void setVisitorTypeId(String visitorTypeId) {
+		this.visitorTypeId = visitorTypeId;
+	}
+
+	/**
+	 * Get 璁块棶浜哄憳涓婚敭
+	 */
+	public String getVisitorId() {
+		return visitorId;
+	}
+
+	/**
+	 * Set 璁块棶浜哄憳涓婚敭
+	 */
+	public void setVisitorId(String visitorId) {
+		this.visitorId = visitorId;
 	}
 
 	/**
@@ -217,6 +203,20 @@
 	}
 
 	/**
+	 * Get 琚闂汉鍛樹富閿�
+	 */
+	public String getVisiteeId() {
+		return visiteeId;
+	}
+
+	/**
+	 * Set 琚闂汉鍛樹富閿�
+	 */
+	public void setVisiteeId(String visiteeId) {
+		this.visiteeId = visiteeId;
+	}
+
+	/**
 	 * Get visiteeCompanyId
 	 */
 	public String getVisiteeCompanyId() {
@@ -231,17 +231,17 @@
 	}
 
 	/**
-	 * Get 璁垮绫诲瀷
+	 * Get 鏈�鏂扮殑璁块棶鐘舵��
 	 */
-	public String getVisitorTypeId() {
-		return visitorTypeId;
+	public String getCurrentStateId() {
+		return currentStateId;
 	}
 
 	/**
-	 * Set 璁垮绫诲瀷
+	 * Set 鏈�鏂扮殑璁块棶鐘舵��
 	 */
-	public void setVisitorTypeId(String visitorTypeId) {
-		this.visitorTypeId = visitorTypeId;
+	public void setCurrentStateId(String currentStateId) {
+		this.currentStateId = currentStateId;
 	}
 
 	/**
@@ -260,10 +260,10 @@
 
 	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