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

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java                        |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java             |   76 ++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java                      |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java         |  201 ++++++++---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java          |   22 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java                       |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java                         |   26 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java                    |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java                           |    6 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java                     |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java              |  366 ++++++++------------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java                                    |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java     |    6 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java         |    6 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java           |  190 +++++++++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java            |   84 ++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java                          |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java                             |    6 
 19 files changed, 646 insertions(+), 367 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
index f1a211d..a802b98 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java
@@ -74,7 +74,7 @@
                     fragment_visit_left_person_row_check_box.setChecked(true);
                 }
 
-                fragment_visit_left_person_row_name.setText(item.getName());
+                fragment_visit_left_person_row_name.setText(item.getUsername());
 
                 //fragment_visit_left_person_row_status.setText(item.getStatus());
                 fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
index 4281f83..b9333aa 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java
@@ -54,7 +54,7 @@
             Object data = getList().get(position);
             if (data instanceof CheckInQueryItem) {
                 CheckInQueryItem item = (CheckInQueryItem) data;
-                fragment_check_in_left_visitor_row_name.setText(item.getName());
+                fragment_check_in_left_visitor_row_name.setText(item.getUsername());
                 fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));
             }
         }
@@ -90,7 +90,7 @@
             Object data = getList().get(position);
             if (data instanceof CheckInQueryItem) {
                 CheckInQueryItem item = (CheckInQueryItem) data;
-                fragment_check_in_left_interviewee_row_name.setText(item.getName());
+                fragment_check_in_left_interviewee_row_name.setText(item.getUsername());
                 fragment_check_in_left_interviewee_row_dept.setText(item.getDeptName());
                 fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));
             }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
index a520dac..788e44d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
@@ -42,7 +42,7 @@
                 fragment_phone_call_left_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
             }
             final PhoneCallQueryItem item = getItem(position);
-            fragment_phone_call_left_row_name.setText(item.getName());
+            fragment_phone_call_left_row_name.setText(item.getUsername());
             fragment_phone_call_left_row_dept.setText(item.getDeptName());
             SimpleDraweeView fragment_phone_call_left_row_photo = viewHolder.findViewById(R.id.fragment_phone_call_left_row_photo);
             fragment_phone_call_left_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
index 5fe59c5..410f5bc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
@@ -52,8 +52,8 @@
                 if (lastIndex == position) {
                     fragment_visit_left_person_row_check_box.setChecked(true);
                 }
-                fragment_visit_left_person_row_name.setText(item.getName());
-                fragment_visit_left_person_row_status.setText(item.getStatus());
+                fragment_visit_left_person_row_name.setText(item.getUsername());
+                fragment_visit_left_person_row_status.setText("");
                 fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
 
                 View fragment_visit_left_line = viewHolder.findViewById(R.id.fragment_visit_left_line);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
index e871ce9..05b89b1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java
@@ -3,18 +3,98 @@
 
 public class AttendanceQueryItem {
 
-	// 璇佷欢缂栧彿
-	private String identifyNum;
+	// 浜哄憳涓婚敭
+	private String registerId;
 	// 浜哄憳鍚嶅瓧
-	private String name;
-	// 鍚嶇О
-	private String gender;
-	// 鑱屼綅鍚嶇О
-	private String postName;
-	// 閮ㄩ棬鍚嶇О
-	private String deptName;
+	private String username;
 	// 鍥剧墖鍦板潃
 	private String imagePath;
+	// 鍏徃鍚嶇О
+	private String companyName;
+	// 搴ф満鐢佃瘽
+	private String tel;
+	// 璇佷欢缂栧彿
+	private String identifyNum;
+	// 閮ㄩ棬鍚嶇О
+	private String deptName;
+	// 鍏徃涓婚敭
+	private String companyId;
+	// 鑱屼綅鍚嶇О
+	private String postName;
+	// 绉诲姩鐢佃瘽
+	private String mobilePhone;
+	// 
+	private String type;
+
+	/**
+	 * Get 浜哄憳涓婚敭
+	 */
+	public String getRegisterId() {
+		return registerId;
+	}
+	
+	/**
+	 * Set 浜哄憳涓婚敭
+	 */
+	public void setRegisterId(String registerId) {
+		this.registerId = registerId;
+	}
+
+	/**
+	 * Get 浜哄憳鍚嶅瓧
+	 */
+	public String getUsername() {
+		return username;
+	}
+	
+	/**
+	 * Set 浜哄憳鍚嶅瓧
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * Get 鍥剧墖鍦板潃
+	 */
+	public String getImagePath() {
+		return imagePath;
+	}
+	
+	/**
+	 * Set 鍥剧墖鍦板潃
+	 */
+	public void setImagePath(String imagePath) {
+		this.imagePath = imagePath;
+	}
+
+	/**
+	 * Get 鍏徃鍚嶇О
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+	
+	/**
+	 * Set 鍏徃鍚嶇О
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * Get 搴ф満鐢佃瘽
+	 */
+	public String getTel() {
+		return tel;
+	}
+	
+	/**
+	 * Set 搴ф満鐢佃瘽
+	 */
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
 
 	/**
 	 * Get 璇佷欢缂栧彿
@@ -28,48 +108,6 @@
 	 */
 	public void setIdentifyNum(String identifyNum) {
 		this.identifyNum = identifyNum;
-	}
-
-	/**
-	 * Get 浜哄憳鍚嶅瓧
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * Set 浜哄憳鍚嶅瓧
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Get 鍚嶇О
-	 */
-	public String getGender() {
-		return gender;
-	}
-	
-	/**
-	 * Set 鍚嶇О
-	 */
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-
-	/**
-	 * Get 鑱屼綅鍚嶇О
-	 */
-	public String getPostName() {
-		return postName;
-	}
-	
-	/**
-	 * Set 鑱屼綅鍚嶇О
-	 */
-	public void setPostName(String postName) {
-		this.postName = postName;
 	}
 
 	/**
@@ -87,23 +125,66 @@
 	}
 
 	/**
-	 * Get 鍥剧墖鍦板潃
+	 * Get 鍏徃涓婚敭
 	 */
-	public String getImagePath() {
-		return imagePath;
+	public String getCompanyId() {
+		return companyId;
 	}
 	
 	/**
-	 * Set 鍥剧墖鍦板潃
+	 * Set 鍏徃涓婚敭
 	 */
-	public void setImagePath(String imagePath) {
-		this.imagePath = imagePath;
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	/**
+	 * Get 鑱屼綅鍚嶇О
+	 */
+	public String getPostName() {
+		return postName;
+	}
+	
+	/**
+	 * Set 鑱屼綅鍚嶇О
+	 */
+	public void setPostName(String postName) {
+		this.postName = postName;
+	}
+
+	/**
+	 * Get 绉诲姩鐢佃瘽
+	 */
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	
+	/**
+	 * Set 绉诲姩鐢佃瘽
+	 */
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+
+	/**
+	 * Get 
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Set 
+	 */
+	public void setType(String type) {
+		this.type = type;
 	}
 
 	public String toString() {
 		return 
-			 ",璇佷欢缂栧彿 =" + identifyNum +  ",浜哄憳鍚嶅瓧 =" + name       +  ",鍚嶇О ="   + gender     + 
-			 ",鑱屼綅鍚嶇О =" + postName   +  ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍥剧墖鍦板潃 =" + imagePath 
-			;
+			 ",浜哄憳涓婚敭 =" + registerId +  ",浜哄憳鍚嶅瓧 =" + username   +  ",鍥剧墖鍦板潃 =" + imagePath  + 
+			 ",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + tel        +  ",璇佷欢缂栧彿 =" + identifyNum + 
+			 ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   + 
+			 ",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
 	}
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
index d06c09d..fc162b6 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
@@ -4,17 +4,17 @@
 public class CheckInQueryItem {
 
 	// 浜哄憳涓婚敭
-	private String id;
+	private String registerId;
 	// 浜哄憳鍚嶅瓧
-	private String name;
+	private String username;
 	// 鍥剧墖鍦板潃
 	private String imagePath;
 	// 鍏徃鍚嶇О
 	private String companyName;
 	// 搴ф満鐢佃瘽
-	private String phone;
+	private String tel;
 	// 璇佷欢缂栧彿
-	private String identify;
+	private String identifyNum;
 	// 閮ㄩ棬鍚嶇О
 	private String deptName;
 	// 鍏徃涓婚敭
@@ -23,35 +23,35 @@
 	private String postName;
 	// 绉诲姩鐢佃瘽
 	private String mobilePhone;
-	//
-	private int type;
+	// 
+	private String type;
 
 	/**
 	 * Get 浜哄憳涓婚敭
 	 */
-	public String getId() {
-		return id;
+	public String getRegisterId() {
+		return registerId;
 	}
-
+	
 	/**
 	 * Set 浜哄憳涓婚敭
 	 */
-	public void setId(String id) {
-		this.id = id;
+	public void setRegisterId(String registerId) {
+		this.registerId = registerId;
 	}
 
 	/**
 	 * Get 浜哄憳鍚嶅瓧
 	 */
-	public String getName() {
-		return name;
+	public String getUsername() {
+		return username;
 	}
-
+	
 	/**
 	 * Set 浜哄憳鍚嶅瓧
 	 */
-	public void setName(String name) {
-		this.name = name;
+	public void setUsername(String username) {
+		this.username = username;
 	}
 
 	/**
@@ -60,7 +60,7 @@
 	public String getImagePath() {
 		return imagePath;
 	}
-
+	
 	/**
 	 * Set 鍥剧墖鍦板潃
 	 */
@@ -74,7 +74,7 @@
 	public String getCompanyName() {
 		return companyName;
 	}
-
+	
 	/**
 	 * Set 鍏徃鍚嶇О
 	 */
@@ -85,29 +85,29 @@
 	/**
 	 * Get 搴ф満鐢佃瘽
 	 */
-	public String getPhone() {
-		return phone;
+	public String getTel() {
+		return tel;
 	}
-
+	
 	/**
 	 * Set 搴ф満鐢佃瘽
 	 */
-	public void setPhone(String phone) {
-		this.phone = phone;
+	public void setTel(String tel) {
+		this.tel = tel;
 	}
 
 	/**
 	 * Get 璇佷欢缂栧彿
 	 */
-	public String getIdentify() {
-		return identify;
+	public String getIdentifyNum() {
+		return identifyNum;
 	}
-
+	
 	/**
 	 * Set 璇佷欢缂栧彿
 	 */
-	public void setIdentify(String identify) {
-		this.identify = identify;
+	public void setIdentifyNum(String identifyNum) {
+		this.identifyNum = identifyNum;
 	}
 
 	/**
@@ -116,7 +116,7 @@
 	public String getDeptName() {
 		return deptName;
 	}
-
+	
 	/**
 	 * Set 閮ㄩ棬鍚嶇О
 	 */
@@ -130,7 +130,7 @@
 	public String getCompanyId() {
 		return companyId;
 	}
-
+	
 	/**
 	 * Set 鍏徃涓婚敭
 	 */
@@ -144,7 +144,7 @@
 	public String getPostName() {
 		return postName;
 	}
-
+	
 	/**
 	 * Set 鑱屼綅鍚嶇О
 	 */
@@ -158,7 +158,7 @@
 	public String getMobilePhone() {
 		return mobilePhone;
 	}
-
+	
 	/**
 	 * Set 绉诲姩鐢佃瘽
 	 */
@@ -167,24 +167,24 @@
 	}
 
 	/**
-	 * Get
+	 * Get 
 	 */
-	public int getType() {
+	public String getType() {
 		return type;
 	}
-
+	
 	/**
-	 * Set
+	 * Set 
 	 */
-	public void setType(int type) {
+	public void setType(String type) {
 		this.type = type;
 	}
 
 	public String toString() {
-		return
-				",浜哄憳涓婚敭 =" + id         +  ",浜哄憳鍚嶅瓧 =" + name       +  ",鍥剧墖鍦板潃 =" + imagePath  +
-						",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + phone      +  ",璇佷欢缂栧彿 =" + identify   +
-						",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   +
-						",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
+		return 
+			 ",浜哄憳涓婚敭 =" + registerId +  ",浜哄憳鍚嶅瓧 =" + username   +  ",鍥剧墖鍦板潃 =" + imagePath  + 
+			 ",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + tel        +  ",璇佷欢缂栧彿 =" + identifyNum + 
+			 ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   + 
+			 ",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
 	}
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
new file mode 100644
index 0000000..34ea2dd
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/DeviceQueryItem.java
@@ -0,0 +1,76 @@
+package cn.com.basic.face.discern.query.item;
+
+
+public class DeviceQueryItem {
+
+	// 璁惧涓婚敭
+	private String id;
+	// 鍏徃涓婚敭
+	private String companyId;
+	// 璁惧鍦扮偣
+	private String deviceName;
+	// 璁惧鎺堟潈鐮�
+	private String authorizationId;
+
+	/**
+	 * Get 璁惧涓婚敭
+	 */
+	public String getId() {
+		return id;
+	}
+	
+	/**
+	 * Set 璁惧涓婚敭
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * Get 鍏徃涓婚敭
+	 */
+	public String getCompanyId() {
+		return companyId;
+	}
+	
+	/**
+	 * Set 鍏徃涓婚敭
+	 */
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	/**
+	 * Get 璁惧鍦扮偣
+	 */
+	public String getDeviceName() {
+		return deviceName;
+	}
+	
+	/**
+	 * Set 璁惧鍦扮偣
+	 */
+	public void setDeviceName(String deviceName) {
+		this.deviceName = deviceName;
+	}
+
+	/**
+	 * Get 璁惧鎺堟潈鐮�
+	 */
+	public String getAuthorizationId() {
+		return authorizationId;
+	}
+	
+	/**
+	 * Set 璁惧鎺堟潈鐮�
+	 */
+	public void setAuthorizationId(String authorizationId) {
+		this.authorizationId = authorizationId;
+	}
+
+	public String toString() {
+		return 
+			 ",璁惧涓婚敭 =" + id         +  ",鍏徃涓婚敭 =" + companyId  +  ",璁惧鍦扮偣 =" + deviceName + 
+			 ",璁惧鎺堟潈鐮� ="+ authorizationId;
+	}
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java
index 07f8b0f..4ceb96e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PhoneCallQueryItem.java
@@ -4,9 +4,9 @@
 public class PhoneCallQueryItem {
 
 	// 浜哄憳涓婚敭
-	private String id;
+	private String registerId;
 	// 浜哄憳鍚嶅瓧
-	private String name;
+	private String username;
 	// 鍥剧墖鍦板潃
 	private String imagePath;
 	// 鍏徃鍚嶇О
@@ -29,29 +29,29 @@
 	/**
 	 * Get 浜哄憳涓婚敭
 	 */
-	public String getId() {
-		return id;
+	public String getRegisterId() {
+		return registerId;
 	}
 	
 	/**
 	 * Set 浜哄憳涓婚敭
 	 */
-	public void setId(String id) {
-		this.id = id;
+	public void setRegisterId(String registerId) {
+		this.registerId = registerId;
 	}
 
 	/**
 	 * Get 浜哄憳鍚嶅瓧
 	 */
-	public String getName() {
-		return name;
+	public String getUsername() {
+		return username;
 	}
 	
 	/**
 	 * Set 浜哄憳鍚嶅瓧
 	 */
-	public void setName(String name) {
-		this.name = name;
+	public void setUsername(String username) {
+		this.username = username;
 	}
 
 	/**
@@ -182,7 +182,7 @@
 
 	public String toString() {
 		return 
-			 ",浜哄憳涓婚敭 =" + id         +  ",浜哄憳鍚嶅瓧 =" + name       +  ",鍥剧墖鍦板潃 =" + imagePath  + 
+			 ",浜哄憳涓婚敭 =" + registerId +  ",浜哄憳鍚嶅瓧 =" + username   +  ",鍥剧墖鍦板潃 =" + imagePath  + 
 			 ",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + tel        +  ",璇佷欢缂栧彿 =" + identifyNum + 
 			 ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   + 
 			 ",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java
new file mode 100644
index 0000000..0558930
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/RegisterQueryItem.java
@@ -0,0 +1,190 @@
+package cn.com.basic.face.discern.query.item;
+
+
+public class RegisterQueryItem {
+
+	// 浜哄憳涓婚敭
+	private String registerId;
+	// 浜哄憳鍚嶅瓧
+	private String username;
+	// 鍥剧墖鍦板潃
+	private String imagePath;
+	// 鍏徃鍚嶇О
+	private String companyName;
+	// 搴ф満鐢佃瘽
+	private String tel;
+	// 璇佷欢缂栧彿
+	private String identifyNum;
+	// 閮ㄩ棬鍚嶇О
+	private String deptName;
+	// 鍏徃涓婚敭
+	private String companyId;
+	// 鑱屼綅鍚嶇О
+	private String postName;
+	// 绉诲姩鐢佃瘽
+	private String mobilePhone;
+	// 
+	private String type;
+
+	/**
+	 * Get 浜哄憳涓婚敭
+	 */
+	public String getRegisterId() {
+		return registerId;
+	}
+	
+	/**
+	 * Set 浜哄憳涓婚敭
+	 */
+	public void setRegisterId(String registerId) {
+		this.registerId = registerId;
+	}
+
+	/**
+	 * Get 浜哄憳鍚嶅瓧
+	 */
+	public String getUsername() {
+		return username;
+	}
+	
+	/**
+	 * Set 浜哄憳鍚嶅瓧
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * Get 鍥剧墖鍦板潃
+	 */
+	public String getImagePath() {
+		return imagePath;
+	}
+	
+	/**
+	 * Set 鍥剧墖鍦板潃
+	 */
+	public void setImagePath(String imagePath) {
+		this.imagePath = imagePath;
+	}
+
+	/**
+	 * Get 鍏徃鍚嶇О
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+	
+	/**
+	 * Set 鍏徃鍚嶇О
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * Get 搴ф満鐢佃瘽
+	 */
+	public String getTel() {
+		return tel;
+	}
+	
+	/**
+	 * Set 搴ф満鐢佃瘽
+	 */
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	/**
+	 * Get 璇佷欢缂栧彿
+	 */
+	public String getIdentifyNum() {
+		return identifyNum;
+	}
+	
+	/**
+	 * Set 璇佷欢缂栧彿
+	 */
+	public void setIdentifyNum(String identifyNum) {
+		this.identifyNum = identifyNum;
+	}
+
+	/**
+	 * Get 閮ㄩ棬鍚嶇О
+	 */
+	public String getDeptName() {
+		return deptName;
+	}
+	
+	/**
+	 * Set 閮ㄩ棬鍚嶇О
+	 */
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+
+	/**
+	 * Get 鍏徃涓婚敭
+	 */
+	public String getCompanyId() {
+		return companyId;
+	}
+	
+	/**
+	 * Set 鍏徃涓婚敭
+	 */
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	/**
+	 * Get 鑱屼綅鍚嶇О
+	 */
+	public String getPostName() {
+		return postName;
+	}
+	
+	/**
+	 * Set 鑱屼綅鍚嶇О
+	 */
+	public void setPostName(String postName) {
+		this.postName = postName;
+	}
+
+	/**
+	 * Get 绉诲姩鐢佃瘽
+	 */
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	
+	/**
+	 * Set 绉诲姩鐢佃瘽
+	 */
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+
+	/**
+	 * Get 
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Set 
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String toString() {
+		return 
+			 ",浜哄憳涓婚敭 =" + registerId +  ",浜哄憳鍚嶅瓧 =" + username   +  ",鍥剧墖鍦板潃 =" + imagePath  + 
+			 ",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + tel        +  ",璇佷欢缂栧彿 =" + identifyNum + 
+			 ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   + 
+			 ",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
+	}
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java
index ea9bee8..8cf3a42 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitQueryItem.java
@@ -1,235 +1,57 @@
 package cn.com.basic.face.discern.query.item;
 
-import java.util.Date;
-
 
 public class VisitQueryItem {
 
+	// 浜哄憳涓婚敭
+	private String registerId;
 	// 浜哄憳鍚嶅瓧
-	private String name;
-	// 绉诲姩鐢佃瘽
-	private String mobilePhone;
-	// 鍚嶇О
-	private String gender;
-	// 鍚嶇О
-	private String identityType;
-	// 鍚嶇О
-	private String countryName;
-	// 璇佷欢缂栧彿
-	private String identifyNum;
-	// 鍑虹敓鏃ユ湡
-	private String birthday;
-	// 鍏徃鍚嶇О
-	private String compnayName;
-	// 浜哄憳鍚嶅瓧
-	private String toPerson;
-	// 鏉ヨ鏃堕棿
-	private String startTime;
-	// 绛剧鏃堕棿
-	private String lastTime;
-	// 璁块棶浜嬬敱
-	private String bfsq;
-	// 閮ㄩ棬鍚嶇О
-	private String deptName;
-	// 鏈�鏂扮殑璁块棶鐘舵��
-	private String status;
+	private String username;
 	// 鍥剧墖鍦板潃
 	private String imagePath;
+	// 鍏徃鍚嶇О
+	private String companyName;
+	// 搴ф満鐢佃瘽
+	private String tel;
+	// 璇佷欢缂栧彿
+	private String identifyNum;
+	// 閮ㄩ棬鍚嶇О
+	private String deptName;
+	// 鍏徃涓婚敭
+	private String companyId;
+	// 鑱屼綅鍚嶇О
+	private String postName;
+	// 绉诲姩鐢佃瘽
+	private String mobilePhone;
+	// 
+	private String type;
 
 	/**
-	 * Get 浜哄憳鍚嶅瓧
+	 * Get 浜哄憳涓婚敭
 	 */
-	public String getName() {
-		return name;
+	public String getRegisterId() {
+		return registerId;
 	}
-
+	
 	/**
-	 * Set 浜哄憳鍚嶅瓧
+	 * Set 浜哄憳涓婚敭
 	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Get 绉诲姩鐢佃瘽
-	 */
-	public String getMobilePhone() {
-		return mobilePhone;
-	}
-
-	/**
-	 * Set 绉诲姩鐢佃瘽
-	 */
-	public void setMobilePhone(String mobilePhone) {
-		this.mobilePhone = mobilePhone;
-	}
-
-	/**
-	 * Get 鍚嶇О
-	 */
-	public String getGender() {
-		return gender;
-	}
-
-	/**
-	 * Set 鍚嶇О
-	 */
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-
-	/**
-	 * Get 鍚嶇О
-	 */
-	public String getIdentityType() {
-		return identityType;
-	}
-
-	/**
-	 * Set 鍚嶇О
-	 */
-	public void setIdentityType(String identityType) {
-		this.identityType = identityType;
-	}
-
-	/**
-	 * Get 鍚嶇О
-	 */
-	public String getCountryName() {
-		return countryName;
-	}
-
-	/**
-	 * Set 鍚嶇О
-	 */
-	public void setCountryName(String countryName) {
-		this.countryName = countryName;
-	}
-
-	/**
-	 * Get 璇佷欢缂栧彿
-	 */
-	public String getIdentifyNum() {
-		return identifyNum;
-	}
-
-	/**
-	 * Set 璇佷欢缂栧彿
-	 */
-	public void setIdentifyNum(String identifyNum) {
-		this.identifyNum = identifyNum;
-	}
-
-	/**
-	 * Get 鍑虹敓鏃ユ湡
-	 */
-	public String getBirthday() {
-		return birthday;
-	}
-
-	/**
-	 * Set 鍑虹敓鏃ユ湡
-	 */
-	public void setBirthday(String birthday) {
-		this.birthday = birthday;
-	}
-
-	/**
-	 * Get 鍏徃鍚嶇О
-	 */
-	public String getCompnayName() {
-		return compnayName;
-	}
-
-	/**
-	 * Set 鍏徃鍚嶇О
-	 */
-	public void setCompnayName(String compnayName) {
-		this.compnayName = compnayName;
+	public void setRegisterId(String registerId) {
+		this.registerId = registerId;
 	}
 
 	/**
 	 * Get 浜哄憳鍚嶅瓧
 	 */
-	public String getToPerson() {
-		return toPerson;
+	public String getUsername() {
+		return username;
 	}
-
+	
 	/**
 	 * Set 浜哄憳鍚嶅瓧
 	 */
-	public void setToPerson(String toPerson) {
-		this.toPerson = toPerson;
-	}
-
-	/**
-	 * Get 鏉ヨ鏃堕棿
-	 */
-	public String getStartTime() {
-		return startTime;
-	}
-
-	/**
-	 * Set 鏉ヨ鏃堕棿
-	 */
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
-	}
-
-	/**
-	 * Get 绛剧鏃堕棿
-	 */
-	public String getLastTime() {
-		return lastTime;
-	}
-
-	/**
-	 * Set 绛剧鏃堕棿
-	 */
-	public void setLastTime(String lastTime) {
-		this.lastTime = lastTime;
-	}
-
-	/**
-	 * Get 璁块棶浜嬬敱
-	 */
-	public String getBfsq() {
-		return bfsq;
-	}
-
-	/**
-	 * Set 璁块棶浜嬬敱
-	 */
-	public void setBfsq(String bfsq) {
-		this.bfsq = bfsq;
-	}
-
-	/**
-	 * Get 閮ㄩ棬鍚嶇О
-	 */
-	public String getDeptName() {
-		return deptName;
-	}
-
-	/**
-	 * Set 閮ㄩ棬鍚嶇О
-	 */
-	public void setDeptName(String deptName) {
-		this.deptName = deptName;
-	}
-
-	/**
-	 * Get 鏈�鏂扮殑璁块棶鐘舵��
-	 */
-	public String getStatus() {
-		return status;
-	}
-
-	/**
-	 * Set 鏈�鏂扮殑璁块棶鐘舵��
-	 */
-	public void setStatus(String status) {
-		this.status = status;
+	public void setUsername(String username) {
+		this.username = username;
 	}
 
 	/**
@@ -238,7 +60,7 @@
 	public String getImagePath() {
 		return imagePath;
 	}
-
+	
 	/**
 	 * Set 鍥剧墖鍦板潃
 	 */
@@ -246,13 +68,123 @@
 		this.imagePath = imagePath;
 	}
 
+	/**
+	 * Get 鍏徃鍚嶇О
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+	
+	/**
+	 * Set 鍏徃鍚嶇О
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * Get 搴ф満鐢佃瘽
+	 */
+	public String getTel() {
+		return tel;
+	}
+	
+	/**
+	 * Set 搴ф満鐢佃瘽
+	 */
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	/**
+	 * Get 璇佷欢缂栧彿
+	 */
+	public String getIdentifyNum() {
+		return identifyNum;
+	}
+	
+	/**
+	 * Set 璇佷欢缂栧彿
+	 */
+	public void setIdentifyNum(String identifyNum) {
+		this.identifyNum = identifyNum;
+	}
+
+	/**
+	 * Get 閮ㄩ棬鍚嶇О
+	 */
+	public String getDeptName() {
+		return deptName;
+	}
+	
+	/**
+	 * Set 閮ㄩ棬鍚嶇О
+	 */
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+
+	/**
+	 * Get 鍏徃涓婚敭
+	 */
+	public String getCompanyId() {
+		return companyId;
+	}
+	
+	/**
+	 * Set 鍏徃涓婚敭
+	 */
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	/**
+	 * Get 鑱屼綅鍚嶇О
+	 */
+	public String getPostName() {
+		return postName;
+	}
+	
+	/**
+	 * Set 鑱屼綅鍚嶇О
+	 */
+	public void setPostName(String postName) {
+		this.postName = postName;
+	}
+
+	/**
+	 * Get 绉诲姩鐢佃瘽
+	 */
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	
+	/**
+	 * Set 绉诲姩鐢佃瘽
+	 */
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+
+	/**
+	 * Get 
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Set 
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	public String toString() {
-		return
-				",浜哄憳鍚嶅瓧 =" + name       +  ",绉诲姩鐢佃瘽 =" + mobilePhone +  ",鍚嶇О ="   + gender     +
-						",鍚嶇О ="   + identityType +  ",鍚嶇О ="   + countryName +  ",璇佷欢缂栧彿 =" + identifyNum +
-						",鍑虹敓鏃ユ湡 =" + birthday   +  ",鍏徃鍚嶇О =" + compnayName +  ",浜哄憳鍚嶅瓧 =" + toPerson   +
-						",鏉ヨ鏃堕棿 =" + startTime  +  ",绛剧鏃堕棿 =" + lastTime   +  ",璁块棶浜嬬敱 =" + bfsq       +
-						",閮ㄩ棬鍚嶇О =" + deptName   +  ",鏈�鏂扮殑璁块棶鐘舵�� ="+ status     +  ",鍥剧墖鍦板潃 =" + imagePath
-				;
+		return 
+			 ",浜哄憳涓婚敭 =" + registerId +  ",浜哄憳鍚嶅瓧 =" + username   +  ",鍥剧墖鍦板潃 =" + imagePath  + 
+			 ",鍏徃鍚嶇О =" + companyName +  ",搴ф満鐢佃瘽 =" + tel        +  ",璇佷欢缂栧彿 =" + identifyNum + 
+			 ",閮ㄩ棬鍚嶇О =" + deptName   +  ",鍏徃涓婚敭 =" + companyId  +  ",鑱屼綅鍚嶇О =" + postName   + 
+			 ",绉诲姩鐢佃瘽 =" + mobilePhone +  ", ="     + type      ;
 	}
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
index cf43420..3894400 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
@@ -93,8 +93,8 @@
 
     public void setVisitorInfo(AttendanceQueryItem item) {
         fragment_attendance_right_id_num.setText(item.getIdentifyNum());
-        fragment_attendance_right_name.setText(item.getName());
-        fragment_attendance_right_gender.setText(item.getGender());
+        fragment_attendance_right_name.setText(item.getUsername());
+        fragment_attendance_right_gender.setText("");
         fragment_attendance_right_post.setText(item.getPostName());
         fragment_attendance_right_dept.setText(item.getDeptName());
         fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 12df8a1..1f722c0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -138,8 +138,8 @@
         RequestParams params = new RequestParams();
         params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));
         params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());
-        params.addBodyParameter(Visit.FieldNames.visitorPersonId, visitor.getId());
-        params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getId());
+        params.addBodyParameter(Visit.FieldNames.visitorPersonId, visitor.getRegisterId());
+        params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getRegisterId());
         params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId());
         params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
index 099fc09..f871b45 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
@@ -97,20 +97,20 @@
     }
 
     public void setVisitInfo(VisitQueryItem item) {
-        fragment_visit_right_name.setText(item.getName());
+        fragment_visit_right_name.setText(item.getUsername());
         fragment_visit_right_phone.setText(item.getMobilePhone());
-        fragment_visit_right_gender.setText(item.getGender());
-        fragment_visit_right_id_type.setText(item.getIdentityType());
-        fragment_visit_right_country.setText(item.getCountryName());
-        fragment_visit_right_id_num.setText(item.getIdentifyNum());
-        fragment_visit_right_birthday.setText(item.getBirthday());
-        fragment_visit_right_company.setText(item.getCompnayName());
-        fragment_visit_right_person.setText(item.getToPerson());
-        fragment_visit_right_visit_reason.setText(item.getBfsq());
-        fragment_visit_right_from_dept.setText(item.getDeptName());
-        fragment_visit_right_status.setText(item.getStatus());
-        fragment_visit_right_visit_time.setText(item.getStartTime());
-        fragment_visit_right_exit_time.setText(item.getLastTime());
+//        fragment_visit_right_gender.setText(item.);
+//        fragment_visit_right_id_type.setText(item.getIdentityType());
+//        fragment_visit_right_country.setText(item.getCountryName());
+//        fragment_visit_right_id_num.setText(item.getIdentifyNum());
+//        fragment_visit_right_birthday.setText(item.getBirthday());
+//        fragment_visit_right_company.setText(item.getCompnayName());
+//        fragment_visit_right_person.setText(item.getToPerson());
+//        fragment_visit_right_visit_reason.setText(item.getBfsq());
+//        fragment_visit_right_from_dept.setText(item.getDeptName());
+//        fragment_visit_right_status.setText(item.getStatus());
+//        fragment_visit_right_visit_time.setText(item.getStartTime());
+//        fragment_visit_right_exit_time.setText(item.getLastTime());
         fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
         fragment_visit_right_card_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
     }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 218048d..abb3087 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -57,7 +57,7 @@
                     if (isSortByDept) {
                         name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
                     } else {
-                        name = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1);
+                        name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
                     }
                     if (!name.equals(prev)) {
                         allItems.add(name);
@@ -87,8 +87,8 @@
                         return dept1Name_a.compareTo(dept1Name_b);
                     }
                 }
-                String name1 = t1.getName()==null?"":t1.getName();
-                String name2 = t2.getName()==null?"":t2.getName();
+                String name1 = t1.getUsername()==null?"":t1.getUsername();
+                String name2 = t2.getUsername()==null?"":t2.getUsername();
                 String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
                 String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
                 return dept1Name_a.compareTo(dept1Name_b);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index 2381f5a..b33b85a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -37,7 +37,7 @@
                     if (isSortByDept) {
                         name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
                     } else {
-                        name = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1);
+                        name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
                     }
                     if (!name.equals(prev)) {
                         allItems.add(name);
@@ -63,8 +63,8 @@
                         return dept1Name_a.compareTo(dept1Name_b);
                     }
                 }
-                String name1 = t1.getName()==null?"":t1.getName();
-                String name2 = t2.getName()==null?"":t2.getName();
+                String name1 = t1.getUsername()==null?"":t1.getUsername();
+                String name2 = t2.getUsername()==null?"":t2.getUsername();
                 String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
                 String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
                 return dept1Name_a.compareTo(dept1Name_b);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index 2deac44..d98b02a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -16,7 +16,7 @@
 
 		public final static String SURVEILLANCE_QUERY = "queryCheckIn/v_list.do";
 
-		public final static String REGISTER_QUERY = "queryRegistry/v_list.do";
+		public final static String REGISTER_QUERY = "queryRegister/v_list.do";
 
 		public final static String CHECK_IN_QUERY = "queryCheckIn/v_list.do";
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
index dd7d5c7..8c890ab 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
@@ -46,7 +46,7 @@
     public void setIntervieweeInfo(final CheckInQueryItem item) {
         if (item == null) return;
         this.item = item;
-        fragment_check_in_right_interviewee_cell_name.setText(item.getName());
+        fragment_check_in_right_interviewee_cell_name.setText(item.getUsername());
         fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName());
         fragment_check_in_right_interviewee_cell_post.setText(item.getPostName());
         fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));
@@ -58,12 +58,12 @@
 
     @OnClick(R.id.fragment_check_in_right_interviewee_cell_call_tel)
     public void fragment_check_in_right_interviewee_cell_call_tel_click(View view) {
-        Toast.makeText(MainActivity.getInstance(), "姝e湪鍛煎彨搴ф満"+item.getPhone(), Toast.LENGTH_SHORT).show();
+        Toast.makeText(MainActivity.getInstance(), "姝e湪鍛煎彨搴ф満"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
     }
 
     @OnClick(R.id.fragment_check_in_right_interviewee_cell_call_mobile)
     public void fragment_check_in_right_interviewee_cell_call_mobile_click(View view) {
-        Toast.makeText(MainActivity.getInstance(), "姝e湪鍛煎彨鎵嬫満"+item.getPhone(), Toast.LENGTH_SHORT).show();
+        Toast.makeText(MainActivity.getInstance(), "姝e湪鍛煎彨鎵嬫満"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
     }
 
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
index 416eeb0..a6e56ca 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
@@ -44,10 +44,10 @@
 
     public void setVisitorInfo(CheckInQueryItem item) {
         this.item = item;
-        fragment_check_in_right_visitor_cell_name.setText(item.getName());
+        fragment_check_in_right_visitor_cell_name.setText(item.getUsername());
         fragment_check_in_right_visitor_cell_company_name.setText(item.getCompanyName());
-        fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentify());
-        fragment_check_in_right_visitor_cell_mobile_phone.setText(item.getPhone());
+        fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentifyNum());
+        fragment_check_in_right_visitor_cell_mobile_phone.setText(item.getMobilePhone());
         fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));
     }
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java
index 9c1f5ff..79ee4b4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java
@@ -46,7 +46,7 @@
     public void setIntervieweeInfo(final PhoneCallQueryItem item) {
         if (item == null) return;
         this.item = item;
-        fragment_check_in_right_interviewee_cell_name.setText(item.getName());
+        fragment_check_in_right_interviewee_cell_name.setText(item.getUsername());
         fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName());
         fragment_check_in_right_interviewee_cell_post.setText(item.getPostName());
         fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath()));

--
Gitblit v1.8.0