development-history/proxy.git

			@@ -1,12 +1,11 @@
			package cn.com.basic.face.discern.entity;

			import java.io.Serializable;
			import java.util.Date;

			import cn.com.basic.face.discern.common.BaseEntity;

			/**
			* PhoneCall
			* 不同步
			*/
			public class PhoneCall extends BaseEntity implements Serializable {

			@@ -22,31 +21,69 @@
			/**
			* 呼叫时间
			*/
			public static final String callDatetime = "callDatetime";
			public static final String date = "date";
			/**
			* 呼叫人员主键
			*/
			public static final String callerPersonId = "callerPersonId";
			public static final String callerId = "callerId";
			/**
			* 被呼叫人员主键
			*/
			public static final String calleePersonId = "calleePersonId";
			public static final String calleeId = "calleeId";
			/**
			* 呼叫发生所在设备(地点)
			*/
			public static final String deviceId = "deviceId";
			/**
			* 同步时间
			*/
			public static final String updateTime = "updateTime";
			/**
			* 是否同步
			*/
			public static final String isSynchron = "isSynchron";
			/**
			* 设备所在机构id
			*/
			public static final String deviceCompanyId = "deviceCompanyId";
			}

			// 签到事件主键
			private String phoneCallId;
			// 呼叫时间
			private String callDatetime;
			private String date;
			// 呼叫人员主键
			private String callerPersonId;
			private String callerId;
			// 被呼叫人员主键
			private String calleePersonId;
			private String calleeId;
			// 呼叫发生所在设备(地点)
			private String deviceId;
			// 同步时间
			private String updateTime;
			// 是否同步
			private String isSynchron;
			// 设备所在机构id
			private String deviceCompanyId;

			private String isValid;

			private String createTime;

			public String getIsValid() {
			return isValid;
			}

			public void setIsValid(String isValid) {
			this.isValid = isValid;
			}

			public String getCreateTime() {
			return createTime;
			}

			public void setCreateTime(String createTime) {
			this.createTime = createTime;
			}

			/**
			* Get 签到事件主键
			@@ -65,43 +102,43 @@
			/**
			* Get 呼叫时间
			*/
			public String getCallDatetime() {
			return callDatetime;
			public String getDate() {
			return date;
			}

			/**
			* Set 呼叫时间
			*/
			public void setCallDatetime(String callDatetime) {
			this.callDatetime = callDatetime;
			public void setDate(String date) {
			this.date = date;
			}

			/**
			* Get 呼叫人员主键
			*/
			public String getCallerPersonId() {
			return callerPersonId;
			public String getCallerId() {
			return callerId;
			}

			/**
			* Set 呼叫人员主键
			*/
			public void setCallerPersonId(String callerPersonId) {
			this.callerPersonId = callerPersonId;
			public void setCallerId(String callerId) {
			this.callerId = callerId;
			}

			/**
			* Get 被呼叫人员主键
			*/
			public String getCalleePersonId() {
			return calleePersonId;
			public String getCalleeId() {
			return calleeId;
			}

			/**
			* Set 被呼叫人员主键
			*/
			public void setCalleePersonId(String calleePersonId) {
			this.calleePersonId = calleePersonId;
			public void setCalleeId(String calleeId) {
			this.calleeId = calleeId;
			}

			/**
			@@ -118,9 +155,54 @@
			this.deviceId = deviceId;
			}

			/**
			* Get 同步时间
			*/
			public String getUpdateTime() {
			return updateTime;
			}

			/**
			* Set 同步时间
			*/
			public void setUpdateTime(String updateTime) {
			this.updateTime = updateTime;
			}

			/**
			* Get 是否同步
			* ，Y--已同步，N--未同步
			*/
			public String getIsSynchron() {
			return isSynchron;
			}

			/**
			* Set 是否同步
			* ，Y--已同步，N--未同步
			*/
			public void setIsSynchron(String isSynchron) {
			this.isSynchron = isSynchron;
			}

			/**
			* Get 设备所在机构id
			*/
			public String getDeviceCompanyId() {
			return deviceCompanyId;
			}

			/**
			* Set 设备所在机构id
			*/
			public void setDeviceCompanyId(String deviceCompanyId) {
			this.deviceCompanyId = deviceCompanyId;
			}

			public String toString() {
			return
			",签到事件主键 ="+ phoneCallId + ",呼叫时间 =" + callDatetime + ",呼叫人员主键 ="+ callerPersonId +
			",被呼叫人员主键 ="+ calleePersonId + ",呼叫发生所在设备(地点) ="+ deviceId ;
			",签到事件主键 ="+ phoneCallId + ",呼叫时间 =" + date + ",呼叫人员主键 ="+ callerId +
			",被呼叫人员主键 ="+ calleeId + ",呼叫发生所在设备(地点) ="+ deviceId + ",同步时间 =" + updateTime +
			",是否同步 =" + isSynchron + ",设备所在机构id ="+ deviceCompanyId;
			}
			}