实体类添加注释

house365-hgs-beans/src/main/java/com/house365/beans/entity/AppUrl.java

@@ -3,8 +3,9 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 /**
- * @author
- * Created by Administrator on 2018/9/13.
+ * app列表url实体表
+ *
+ * @author Created by Administrator on 2018/9/13.
  */
 public class AppUrl extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/CityCallConfig.java

@@ -5,6 +5,8 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
+ * 城市呼叫配置表
+ *
  * @author Created by Administrator on 2019/5/6.
  */
 public class CityCallConfig extends DomainObject {

house365-hgs-beans/src/main/java/com/house365/beans/entity/CustomerCallbackLogEntity.java

@@ -27,6 +27,7 @@ import java.util.Date;
 
 /**
  * CustomerCallbackLog数据库实体/领域对象<br>
+ * 客户回访记录实体类
  *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-12-29
@@ -129,6 +130,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 获取客户ID
+     *
      * @return 客户ID
      */
     public Integer getCustomerId() {
@@ -146,6 +148,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 获取客户经理ID
+     *
      * @return 客户经理ID
      */
     public Integer getManagerId() {
@@ -154,6 +157,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 设置客户经理ID
+     *
      * @param managerId 客户经理ID
      */
     public void setManagerId(Integer managerId) {
@@ -162,6 +166,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 获取客户经理姓名
+     *
      * @return 客户经理姓名
      */
     public String getManagerName() {
@@ -188,6 +193,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 设置回访内容
+     *
      * @param content 回访内容
      */
     public void setContent(String content) {
@@ -220,6 +226,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 设置createTime
+     *
      * @param createTime createTime
      */
     public void setCreateTime(java.util.Date createTime) {
@@ -371,6 +378,7 @@ public class CustomerCallbackLogEntity extends DomainObject {
 
     /**
      * 对象比较
+     *
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */

house365-hgs-beans/src/main/java/com/house365/beans/entity/CustomerCallbackTemplateEntity.java

@@ -10,6 +10,8 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 客户回访内容模板实体类
+ *
+ * @author jay
  */
 public class CustomerCallbackTemplateEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/CustomerEntity.java

@@ -31,6 +31,7 @@ import java.util.List;
 
 /**
  * 客户信息数据库实体/领域对象<br>
+ * 私客列表去customer_merge,customer表存放所有客户数据
  *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-09-15

house365-hgs-beans/src/main/java/com/house365/beans/entity/CustomerLogEntity.java

@@ -5,8 +5,9 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
- * @author
- * Created by Administrator on 2019/8/14.
+ * 客户操作日志表
+ *
+ * @author Created by Administrator on 2019/8/14.
  */
 public class CustomerLogEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/CustomerRemindEntity.java

@@ -6,8 +6,9 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
- * @author
- * Created by Administrator on 2019/5/24.
+ * 客户提醒表
+ *
+ * @author Created by Administrator on 2019/5/24.
  */
 public class CustomerRemindEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/DeptSourceStatisticsEntity.java

@@ -2,10 +2,11 @@
  * Description: DeptSourceStatistics数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-10-25 上午 09:42:11
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,342 +14,358 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
-import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * DeptSourceStatistics数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-10-25
- * @see
  * @since 1.0
  */
-public class DeptSourceStatisticsEntity extends StatisticObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 统计对象ID
-	 */
-	
-	private Integer projectId;
-	
-	/**
-	 * 统计对象名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String projectName;
-	
-	/**
-	 * 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	@Length(max=45, message="长度需要大于0且小于45")
-	private String objectType;
-	
-	/**
-	 * 客户状态
-	 */
-	
-	private Integer customerStatus;
-	
-	/**
-	 * 客户数量
-	 */
-	
-	private Integer customerNum;
-	
-	/**
-	 * 来源ID
-	 */
-	
-	private Integer sourceId;
-	
-	/**
-	 * 来源名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String sourceName;
-	
-	/**
-	 * 城市编码
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String city;
-	
-	/**
-	 * 城市名称
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String cityName;
-	
-	/**
-	 * 环比
-	 */
-	
-	private java.math.BigDecimal dayBaseRatio;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	//columns END
-	/*
-	public DeptSourceStatistics(){
-	}
-
-	public DeptSourceStatistics(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
-	/**
-	 * 设置统计对象ID
-	 * @param projectId 统计对象ID
-	 */
-	public void setProjectId(Integer projectId) {
-		this.projectId = projectId;
-	}
-
-	/**
-	 * 获取统计对象ID
-	 * @return 统计对象ID
-	 */
-	public Integer getProjectId() {
-		return this.projectId;
-	}
-
-	/**
-	 * 设置统计对象名称
-	 * @param projectName 统计对象名称
-	 */
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-
-	/**
-	 * 获取统计对象名称
-	 * @return 统计对象名称
-	 */
-	public String getProjectName() {
-		return this.projectName;
-	}
-
-	/**
-	 * 设置统计对象类型 1 部门 2 职员 3 项目
-	 * @param objectType 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	public void setObjectType(String objectType) {
-		this.objectType = objectType;
-	}
-
-	/**
-	 * 获取统计对象类型 1 部门 2 职员 3 项目
-	 * @return 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	/**
-	 * 设置客户状态
-	 * @param customerStatus 客户状态
-	 */
-	public void setCustomerStatus(Integer customerStatus) {
-		this.customerStatus = customerStatus;
-	}
-
-	/**
-	 * 获取客户状态
-	 * @return 客户状态
-	 */
-	public Integer getCustomerStatus() {
-		return this.customerStatus;
-	}
-
-	/**
-	 * 设置客户数量
-	 * @param customerNum 客户数量
-	 */
-	public void setCustomerNum(Integer customerNum) {
-		this.customerNum = customerNum;
-	}
-
-	/**
-	 * 获取客户数量
-	 * @return 客户数量
-	 */
-	public Integer getCustomerNum() {
-		return this.customerNum;
-	}
-
-	/**
-	 * 设置来源ID
-	 * @param sourceId 来源ID
-	 */
-	public void setSourceId(Integer sourceId) {
-		this.sourceId = sourceId;
-	}
-
-	/**
-	 * 获取来源ID
-	 * @return 来源ID
-	 */
-	public Integer getSourceId() {
-		return this.sourceId;
-	}
-
-	/**
-	 * 设置来源名称
-	 * @param sourceName 来源名称
-	 */
-	public void setSourceName(String sourceName) {
-		this.sourceName = sourceName;
-	}
-
-	/**
-	 * 获取来源名称
-	 * @return 来源名称
-	 */
-	public String getSourceName() {
-		return this.sourceName;
-	}
-
-	/**
-	 * 设置城市编码
-	 * @param city 城市编码
-	 */
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	/**
-	 * 获取城市编码
-	 * @return 城市编码
-	 */
-	public String getCity() {
-		return this.city;
-	}
-
-	/**
-	 * 设置城市名称
-	 * @param cityName 城市名称
-	 */
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	/**
-	 * 获取城市名称
-	 * @return 城市名称
-	 */
-	public String getCityName() {
-		return this.cityName;
-	}
-
-	/**
-	 * 设置环比
-	 * @param dayBaseRatio 环比
-	 */
-	public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
-		this.dayBaseRatio = dayBaseRatio;
-	}
-
-	/**
-	 * 获取环比
-	 * @return 环比
-	 */
-	public java.math.BigDecimal getDayBaseRatio() {
-		return this.dayBaseRatio;
-	}
-
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
+public class DeptSourceStatisticsEntity extends StatisticObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 统计对象ID
+     */
+
+    private Integer projectId;
+
+    /**
+     * 统计对象名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String projectName;
+
+    /**
+     * 统计对象类型 1 部门 2 职员 3 项目
+     */
+    @Length(max = 45, message = "长度需要大于0且小于45")
+    private String objectType;
+
+    /**
+     * 客户状态
+     */
+
+    private Integer customerStatus;
+
+    /**
+     * 客户数量
+     */
+
+    private Integer customerNum;
+
+    /**
+     * 来源ID
+     */
+
+    private Integer sourceId;
+
+    /**
+     * 来源名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String sourceName;
+
+    /**
+     * 城市编码
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String city;
+
+    /**
+     * 城市名称
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String cityName;
+
+    /**
+     * 环比
+     */
+    private java.math.BigDecimal dayBaseRatio;
+
+    /**
+     * 创建时间
+     */
+    private java.util.Date createTime;
+
+
+    /**
+     * 设置统计对象ID
+     *
+     * @param projectId 统计对象ID
+     */
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    /**
+     * 获取统计对象ID
+     *
+     * @return 统计对象ID
+     */
+    public Integer getProjectId() {
+        return this.projectId;
+    }
+
+    /**
+     * 设置统计对象名称
+     *
+     * @param projectName 统计对象名称
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    /**
+     * 获取统计对象名称
+     *
+     * @return 统计对象名称
+     */
+    public String getProjectName() {
+        return this.projectName;
+    }
+
+    /**
+     * 设置统计对象类型 1 部门 2 职员 3 项目
+     *
+     * @param objectType 统计对象类型 1 部门 2 职员 3 项目
+     */
+    public void setObjectType(String objectType) {
+        this.objectType = objectType;
+    }
+
+    /**
+     * 获取统计对象类型 1 部门 2 职员 3 项目
+     *
+     * @return 统计对象类型 1 部门 2 职员 3 项目
+     */
+    public String getObjectType() {
+        return this.objectType;
+    }
+
+    /**
+     * 设置客户状态
+     *
+     * @param customerStatus 客户状态
+     */
+    public void setCustomerStatus(Integer customerStatus) {
+        this.customerStatus = customerStatus;
+    }
+
+    /**
+     * 获取客户状态
+     *
+     * @return 客户状态
+     */
+    public Integer getCustomerStatus() {
+        return this.customerStatus;
+    }
+
+    /**
+     * 设置客户数量
+     *
+     * @param customerNum 客户数量
+     */
+    public void setCustomerNum(Integer customerNum) {
+        this.customerNum = customerNum;
+    }
+
+    /**
+     * 获取客户数量
+     *
+     * @return 客户数量
+     */
+    public Integer getCustomerNum() {
+        return this.customerNum;
+    }
+
+    /**
+     * 设置来源ID
+     *
+     * @param sourceId 来源ID
+     */
+    public void setSourceId(Integer sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    /**
+     * 获取来源ID
+     *
+     * @return 来源ID
+     */
+    public Integer getSourceId() {
+        return this.sourceId;
+    }
+
+    /**
+     * 设置来源名称
+     *
+     * @param sourceName 来源名称
+     */
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    /**
+     * 获取来源名称
+     *
+     * @return 来源名称
+     */
+    public String getSourceName() {
+        return this.sourceName;
+    }
+
+    /**
+     * 设置城市编码
+     *
+     * @param city 城市编码
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * 获取城市编码
+     *
+     * @return 城市编码
+     */
+    public String getCity() {
+        return this.city;
+    }
+
+    /**
+     * 设置城市名称
+     *
+     * @param cityName 城市名称
+     */
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    /**
+     * 获取城市名称
+     *
+     * @return 城市名称
+     */
+    public String getCityName() {
+        return this.cityName;
+    }
+
+    /**
+     * 设置环比
+     *
+     * @param dayBaseRatio 环比
+     */
+    public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
+        this.dayBaseRatio = dayBaseRatio;
+    }
+
+    /**
+     * 获取环比
+     *
+     * @return 环比
+     */
+    public java.math.BigDecimal getDayBaseRatio() {
+        return this.dayBaseRatio;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 设置创建时间字符串格式
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ProjectId",getProjectId())
-			.append("ProjectName",getProjectName())
-			.append("ObjectType",getObjectType())
-			.append("CustomerStatus",getCustomerStatus())
-			.append("CustomerNum",getCustomerNum())
-			.append("SourceId",getSourceId())
-			.append("SourceName",getSourceName())
-			.append("City",getCity())
-			.append("CityName",getCityName())
-			.append("DayBaseRatio",getDayBaseRatio())
-			.append("CreateTime",getCreateTime())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof DeptSourceStatisticsEntity == false) return false;
-		if(this == obj) return true;
-		DeptSourceStatisticsEntity other = (DeptSourceStatisticsEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("ProjectId", getProjectId())
+                .append("ProjectName", getProjectName())
+                .append("ObjectType", getObjectType())
+                .append("CustomerStatus", getCustomerStatus())
+                .append("CustomerNum", getCustomerNum())
+                .append("SourceId", getSourceId())
+                .append("SourceName", getSourceName())
+                .append("City", getCity())
+                .append("CityName", getCityName())
+                .append("DayBaseRatio", getDayBaseRatio())
+                .append("CreateTime", getCreateTime())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     *
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     *
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof DeptSourceStatisticsEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        DeptSourceStatisticsEntity other = (DeptSourceStatisticsEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/DutyStaffEntity.java

@@ -5,6 +5,12 @@ import com.house365.beans.system.DomainObject;
 
 import java.util.Date;
 
+/**
+ * 值班人员实体类
+ *
+ * @author whh
+ */
+
 public class DutyStaffEntity extends DomainObject {
 
     private static final long serialVersionUID = 1L;

house365-hgs-beans/src/main/java/com/house365/beans/entity/EvaluateUserCustomerLogEntity.java

@@ -2,10 +2,11 @@
  * Description: EvaluateUserCustomerLog数据库实体/领域对象
  * Copyright:   Copyright (c)2018
  * Company:     江苏三六五网络股份有限公司
+ *
  * @author: 江苏三六五网络股份有限公司
  * @version: 1.0
  * Create at:   2018-02-02 上午 11:21:10
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -22,16 +23,14 @@ import org.hibernate.validator.constraints.Length;
 
 /**
  * EvaluateUserCustomerLog数据库实体/领域对象<br>评估用户客户日志
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2018-02-02
  * @see
  * @since 1.0
  */
 public class EvaluateUserCustomerLogEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -39,7 +38,6 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     /**
      * 直销人员id
      */
-
     private Integer userId;
 
     /**
@@ -51,7 +49,6 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     /**
      * 楼盘id
      */
-
     private Integer projectId;
 
     /**
@@ -69,7 +66,6 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     /**
      * 评分
      */
-
     private Integer score;
 
     /**
@@ -78,7 +74,6 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     @Length(max = 255, message = "长度需要大于0且小于255")
     private String content;
 
-
     private String contentTags;
 
     public String getContentTags() {
@@ -92,49 +87,41 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     /**
      * 删除标记 0：未删除；1：已删除；
      */
-
     private Integer isDeleted;
 
     /**
      * 是否已评价 0：未评价；1：已评价；
      */
-
     private Integer isEvaluated;
 
     /**
      * 审核状态 0：待审核；1：审核通过；2：审核不通过；
      */
-
     private Integer checkStatus;
 
     /**
      * 带看创建时间
      */
-
     private java.util.Date createTime;
 
     /**
      * 客户评价时间
      */
-
     private java.util.Date evaluateTime;
 
     /**
      * 带看创建时间
      */
-
     private String createDateStr;
 
     /**
      * 客户评价时间
      */
-
     private String evaluateDateStr;
 
     /**
      * 审核时间
      */
-
     private java.util.Date checkTime;
 
     /**
@@ -149,25 +136,8 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
     @Length(max = 100, message = "长度需要大于0且小于100")
     private String city;
 
-    /**
-     * channel
-     */
-
     private Integer channel;
 
-    //columns END
-    /*
-	public EvaluateUserCustomerLog(){
-	}
-
-	public EvaluateUserCustomerLog(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
     public String getCreateDateStr() {
         return createDateStr;
     }
@@ -186,6 +156,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取直销人员id
+     *
      * @return 直销人员id
      */
     public Integer getUserId() {
@@ -194,6 +165,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 设置直销人员id
+     *
      * @param userId 直销人员id
      */
     public void setUserId(Integer userId) {
@@ -202,6 +174,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取直销人员姓名
+     *
      * @return 直销人员姓名
      */
     public String getUserName() {
@@ -210,6 +183,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 设置直销人员姓名
+     *
      * @param userName 直销人员姓名
      */
     public void setUserName(String userName) {
@@ -218,6 +192,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取楼盘id
+     *
      * @return 楼盘id
      */
     public Integer getProjectId() {
@@ -226,6 +201,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 设置楼盘id
+     *
      * @param projectId 楼盘id
      */
     public void setProjectId(Integer projectId) {
@@ -234,6 +210,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取楼盘名称
+     *
      * @return 楼盘名称
      */
     public String getProjectName() {
@@ -242,6 +219,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 设置楼盘名称
+     *
      * @param projectName 楼盘名称
      */
     public void setProjectName(String projectName) {
@@ -250,6 +228,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取客户姓名
+     *
      * @return 客户姓名
      */
     public String getCustomerName() {
@@ -258,6 +237,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 设置客户姓名
+     *
      * @param customerName 客户姓名
      */
     public void setCustomerName(String customerName) {
@@ -473,8 +453,9 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取城市
+     *
      * @return 城市
-	 */
+     */
     public String getCity() {
         return this.city;
     }
@@ -511,6 +492,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("Id", getId())
@@ -535,26 +517,34 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取hash码
+     *
      * @return HASH码
      */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
 
-	/**
+    /**
      * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof EvaluateUserCustomerLogEntity == false) return false;
-		if(this == obj) return true;
-		EvaluateUserCustomerLogEntity other = (EvaluateUserCustomerLogEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+     *
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EvaluateUserCustomerLogEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        EvaluateUserCustomerLogEntity other = (EvaluateUserCustomerLogEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/HouseInfoEntity.java

@@ -2,10 +2,11 @@
  * Description: HouseInfo数据库实体/领域对象
  * Copyright:   Copyright (c)2017
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2017-12-18 下午 15:44:53
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,259 +14,270 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * HouseInfo数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-12-18
  * @see
  * @since 1.0
  */
-public class HouseInfoEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 楼盘编号
-	 */
-	
-	private Integer houseId;
-	
-	/**
-	 * 楼盘名称
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String houseName;
-	
-	/**
-	 * 楼盘联系电话
-	 */
-	@Length(max=200, message="长度需要大于0且小于200")
-	private String housePhone;
-	
-	/**
-	 * 城市编号
-	 */
-	
-	private Integer cityId;
-	
-	/**
-	 * 城市名称
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String cityName;
-	
-	/**
-	 * 是否删除 0:未删除 1:已删除
-	 */
-	
-	private Integer isDeleted;
-	
-	/**
-	 * 物业类型 1住宅2写字楼3别墅4商业5公寓
-	 */
-	
-	private Integer channel;
-	
-	/**
-	 * cityKey
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String cityKey;
-	
-	//columns END
-	/*
-	public HouseInfo(){
-	}
-
-	public HouseInfo(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
-	/**
-	 * 设置楼盘编号
-	 * @param houseId 楼盘编号
-	 */
-	public void setHouseId(Integer houseId) {
-		this.houseId = houseId;
-	}
-
-	/**
-	 * 获取楼盘编号
-	 * @return 楼盘编号
-	 */
-	public Integer getHouseId() {
-		return this.houseId;
-	}
-
-	/**
-	 * 设置楼盘名称
-	 * @param houseName 楼盘名称
-	 */
-	public void setHouseName(String houseName) {
-		this.houseName = houseName;
-	}
-
-	/**
-	 * 获取楼盘名称
-	 * @return 楼盘名称
-	 */
-	public String getHouseName() {
-		return this.houseName;
-	}
-
-	/**
-	 * 设置楼盘联系电话
-	 * @param housePhone 楼盘联系电话
-	 */
-	public void setHousePhone(String housePhone) {
-		this.housePhone = housePhone;
-	}
-
-	/**
-	 * 获取楼盘联系电话
-	 * @return 楼盘联系电话
-	 */
-	public String getHousePhone() {
-		return this.housePhone;
-	}
-
-	/**
-	 * 设置城市编号
-	 * @param cityId 城市编号
-	 */
-	public void setCityId(Integer cityId) {
-		this.cityId = cityId;
-	}
-
-	/**
-	 * 获取城市编号
-	 * @return 城市编号
-	 */
-	public Integer getCityId() {
-		return this.cityId;
-	}
-
-	/**
-	 * 设置城市名称
-	 * @param cityName 城市名称
-	 */
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	/**
-	 * 获取城市名称
-	 * @return 城市名称
-	 */
-	public String getCityName() {
-		return this.cityName;
-	}
-
-	/**
-	 * 设置是否删除 0:未删除 1:已删除
-	 * @param isDeleted 是否删除 0:未删除 1:已删除
-	 */
-	public void setIsDeleted(Integer isDeleted) {
-		this.isDeleted = isDeleted;
-	}
-
-	/**
-	 * 获取是否删除 0:未删除 1:已删除
-	 * @return 是否删除 0:未删除 1:已删除
-	 */
-	public Integer getIsDeleted() {
-		return this.isDeleted;
-	}
-
-	/**
-	 * 设置物业类型 1住宅2写字楼3别墅4商业5公寓
-	 * @param channel 物业类型 1住宅2写字楼3别墅4商业5公寓
-	 */
-	public void setChannel(Integer channel) {
-		this.channel = channel;
-	}
-
-	/**
-	 * 获取物业类型 1住宅2写字楼3别墅4商业5公寓
-	 * @return 物业类型 1住宅2写字楼3别墅4商业5公寓
-	 */
-	public Integer getChannel() {
-		return this.channel;
-	}
-
-	/**
-	 * 设置cityKey
-	 * @param cityKey cityKey
-	 */
-	public void setCityKey(String cityKey) {
-		this.cityKey = cityKey;
-	}
-
-	/**
-	 * 获取cityKey
-	 * @return cityKey
-	 */
-	public String getCityKey() {
-		return this.cityKey;
-	}
+public class HouseInfoEntity extends DomainObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 楼盘编号
+     */
+
+    private Integer houseId;
+
+    /**
+     * 楼盘名称
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String houseName;
+
+    /**
+     * 楼盘联系电话
+     */
+    @Length(max = 200, message = "长度需要大于0且小于200")
+    private String housePhone;
+
+    /**
+     * 城市编号
+     */
+    private Integer cityId;
+
+    /**
+     * 城市名称
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String cityName;
+
+    /**
+     * 是否删除 0:未删除 1:已删除
+     */
+
+    private Integer isDeleted;
+
+    /**
+     * 物业类型 1住宅2写字楼3别墅4商业5公寓
+     */
+    private Integer channel;
+
+    /**
+     * cityKey
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String cityKey;
+
+
+    /**
+     * 设置楼盘编号
+     *
+     * @param houseId 楼盘编号
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 获取楼盘编号
+     *
+     * @return 楼盘编号
+     */
+    public Integer getHouseId() {
+        return this.houseId;
+    }
+
+    /**
+     * 设置楼盘名称
+     *
+     * @param houseName 楼盘名称
+     */
+    public void setHouseName(String houseName) {
+        this.houseName = houseName;
+    }
+
+    /**
+     * 获取楼盘名称
+     *
+     * @return 楼盘名称
+     */
+    public String getHouseName() {
+        return this.houseName;
+    }
+
+    /**
+     * 设置楼盘联系电话
+     *
+     * @param housePhone 楼盘联系电话
+     */
+    public void setHousePhone(String housePhone) {
+        this.housePhone = housePhone;
+    }
+
+    /**
+     * 获取楼盘联系电话
+     *
+     * @return 楼盘联系电话
+     */
+    public String getHousePhone() {
+        return this.housePhone;
+    }
+
+    /**
+     * 设置城市编号
+     *
+     * @param cityId 城市编号
+     */
+    public void setCityId(Integer cityId) {
+        this.cityId = cityId;
+    }
+
+    /**
+     * 获取城市编号
+     *
+     * @return 城市编号
+     */
+    public Integer getCityId() {
+        return this.cityId;
+    }
+
+    /**
+     * 设置城市名称
+     *
+     * @param cityName 城市名称
+     */
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    /**
+     * 获取城市名称
+     *
+     * @return 城市名称
+     */
+    public String getCityName() {
+        return this.cityName;
+    }
+
+    /**
+     * 设置是否删除 0:未删除 1:已删除
+     *
+     * @param isDeleted 是否删除 0:未删除 1:已删除
+     */
+    public void setIsDeleted(Integer isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    /**
+     * 获取是否删除 0:未删除 1:已删除
+     *
+     * @return 是否删除 0:未删除 1:已删除
+     */
+    public Integer getIsDeleted() {
+        return this.isDeleted;
+    }
+
+    /**
+     * 设置物业类型 1住宅2写字楼3别墅4商业5公寓
+     *
+     * @param channel 物业类型 1住宅2写字楼3别墅4商业5公寓
+     */
+    public void setChannel(Integer channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * 获取物业类型 1住宅2写字楼3别墅4商业5公寓
+     *
+     * @return 物业类型 1住宅2写字楼3别墅4商业5公寓
+     */
+    public Integer getChannel() {
+        return this.channel;
+    }
+
+    /**
+     * 设置cityKey
+     *
+     * @param cityKey cityKey
+     */
+    public void setCityKey(String cityKey) {
+        this.cityKey = cityKey;
+    }
+
+    /**
+     * 获取cityKey
+     *
+     * @return cityKey
+     */
+    public String getCityKey() {
+        return this.cityKey;
+    }
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("HouseId",getHouseId())
-			.append("HouseName",getHouseName())
-			.append("HousePhone",getHousePhone())
-			.append("CityId",getCityId())
-			.append("CityName",getCityName())
-			.append("IsDeleted",getIsDeleted())
-			.append("Channel",getChannel())
-			.append("CityKey",getCityKey())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof HouseInfoEntity == false) return false;
-		if(this == obj) return true;
-		HouseInfoEntity other = (HouseInfoEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("HouseId", getHouseId())
+                .append("HouseName", getHouseName())
+                .append("HousePhone", getHousePhone())
+                .append("CityId", getCityId())
+                .append("CityName", getCityName())
+                .append("IsDeleted", getIsDeleted())
+                .append("Channel", getChannel())
+                .append("CityKey", getCityKey())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     *
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     *
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof HouseInfoEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        HouseInfoEntity other = (HouseInfoEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/KefuEntity.java

@@ -2,6 +2,11 @@ package com.house365.beans.entity;
 
 import com.house365.beans.system.DomainObject;
 
+/**
+ * 客服实体类
+ *
+ * @author whh
+ */
 public class KefuEntity extends DomainObject {
 
     private static final long serialVersionUID = 1L;

house365-hgs-beans/src/main/java/com/house365/beans/entity/LabelEntity.java

@@ -3,8 +3,12 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 import java.util.Date;
-import java.util.List;
 
+/**
+ * 客户标签实体类
+ *
+ * @author whh
+ */
 public class LabelEntity extends DomainObject {
     private static final long serialVersionUID = 1L;
     private String labelId;

house365-hgs-beans/src/main/java/com/house365/beans/entity/LocalReportEntity.java

@@ -71,25 +71,21 @@ public class LocalReportEntity extends DomainObject {
     /**
      * 报备
      */
-
     private Integer record;
 
     /**
      * 到访
      */
-
     private Integer visit;
 
     /**
      * 认购
      */
-
     private Integer buy;
 
     /**
      * 业绩
      */
-
     private Integer score;
 
     /**
@@ -126,7 +122,6 @@ public class LocalReportEntity extends DomainObject {
     /**
      * updateTime
      */
-
     private java.util.Date updateTime;
 
     /**
@@ -479,16 +474,17 @@ public class LocalReportEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("ChannelId",
-                                                                                                      getChannelId()).append(
-            "DepartId", getDepartId()).append("Name", getName()).append("Record", getRecord()).append("Visit",
-                                                                                                      getVisit()).append(
-            "Buy", getBuy()).append("Score", getScore()).append("City", getCity()).append("Status", getStatus()).append(
-            "Creater", getCreater()).append("CreateTime", getCreateTime()).append("LastModifier",
-                                                                                  getLastModifier()).append(
-            "UpdateTime", getUpdateTime()).append("ReportDate", getReportDate()).append("Buyorder",
-                                                                                        getBuyorder()).toString();
+                getChannelId()).append(
+                "DepartId", getDepartId()).append("Name", getName()).append("Record", getRecord()).append("Visit",
+                getVisit()).append(
+                "Buy", getBuy()).append("Score", getScore()).append("City", getCity()).append("Status", getStatus()).append(
+                "Creater", getCreater()).append("CreateTime", getCreateTime()).append("LastModifier",
+                getLastModifier()).append(
+                "UpdateTime", getUpdateTime()).append("ReportDate", getReportDate()).append("Buyorder",
+                getBuyorder()).toString();
     }
 
     /**
@@ -496,6 +492,7 @@ public class LocalReportEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -506,11 +503,14 @@ public class LocalReportEntity extends DomainObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof LocalReportEntity == false)
+        if (obj instanceof LocalReportEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         LocalReportEntity other = (LocalReportEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/LogFieldEntity.java

@@ -3,8 +3,9 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 /**
- * @author
- * Created by Administrator on 2019/8/19.
+ * 日志反射解析表实体类
+ *
+ * @author Created by Administrator on 2019/8/19.
  */
 public class LogFieldEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/MarketBuildingRelEntity.java

@@ -2,10 +2,11 @@
  * Description: MarketBuildingRel数据库实体/领域对象
  * Copyright:   Copyright (c)2017
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2017-12-05 下午 19:20:56
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,9 +14,7 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -23,110 +22,111 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * MarketBuildingRel数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-12-05
  * @see
  * @since 1.0
  */
-public class MarketBuildingRelEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 楼盘ID
-	 */
-	
-	private Integer buildingId;
-	
-	/**
-	 * activeId
-	 */
-	private Integer activeId;
-	
-	//columns END
-	/*
-	public MarketBuildingRel(){
-	}
+public class MarketBuildingRelEntity extends DomainObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	public MarketBuildingRel(
-		Integer id
-	){
-		this.id = id;
-	}
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 楼盘ID
+     */
 
-    */
+    private Integer buildingId;
 
-	/**
-	 * 设置楼盘ID
-	 * @param buildingId 楼盘ID
-	 */
-	public void setBuildingId(Integer buildingId) {
-		this.buildingId = buildingId;
-	}
+    /**
+     * activeId
+     */
+    private Integer activeId;
 
-	/**
-	 * 获取楼盘ID
-	 * @return 楼盘ID
-	 */
-	public Integer getBuildingId() {
-		return this.buildingId;
-	}
+    /**
+     * 设置楼盘ID
+     *
+     * @param buildingId 楼盘ID
+     */
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
 
-	/**
-	 * 设置activeId
-	 * @param activeId activeId
-	 */
-	public void setActiveId(Integer activeId) {
-		this.activeId = activeId;
-	}
+    /**
+     * 获取楼盘ID
+     *
+     * @return 楼盘ID
+     */
+    public Integer getBuildingId() {
+        return this.buildingId;
+    }
 
-	/**
-	 * 获取activeId
-	 * @return activeId
-	 */
-	public Integer getActiveId() {
-		return this.activeId;
-	}
+    /**
+     * 设置activeId
+     *
+     * @param activeId activeId
+     */
+    public void setActiveId(Integer activeId) {
+        this.activeId = activeId;
+    }
+
+    /**
+     * 获取activeId
+     *
+     * @return activeId
+     */
+    public Integer getActiveId() {
+        return this.activeId;
+    }
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("BuildingId",getBuildingId())
-			.append("ActiveId",getActiveId())
-			.toString();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("BuildingId", getBuildingId())
+                .append("ActiveId", getActiveId())
+                .toString();
+    }
 
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
+    /**
+     * 获取hash码
+     *
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
 
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof MarketBuildingRelEntity == false) return false;
-		if(this == obj) return true;
-		MarketBuildingRelEntity other = (MarketBuildingRelEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    /**
+     * 对象比较
+     *
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof MarketBuildingRelEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        MarketBuildingRelEntity other = (MarketBuildingRelEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/MessageEntity.java

@@ -4,6 +4,11 @@ import com.house365.beans.system.DomainObject;
 
 import java.util.Date;
 
+/**
+ * 信息实体类
+ *
+ * @author whh
+ */
 public class MessageEntity extends DomainObject {
 
     private static final long serialVersionUID = 1L;

house365-hgs-beans/src/main/java/com/house365/beans/entity/MessageLogEntity.java

@@ -5,8 +5,9 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
- * @author
- * Created by Administrator on 2018/12/11.
+ * 信息日志表
+ *
+ * @author Created by Administrator on 2018/12/11.
  */
 public class MessageLogEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/NewHouseCityEntity.java

@@ -3,9 +3,10 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 /**
- * 新房城市配置
+ * 新房城市配置实体类
+ *
  * @author jay
- * Created by Administrator on 2020/6/11.
+ *         Created by Administrator on 2020/6/11.
  */
 public class NewHouseCityEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/NoticeEntity.java

@@ -14,14 +14,14 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
-
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 公告数据库实体/领域对象<br>
@@ -32,9 +32,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @since 1.0
  */
 public class NoticeEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -89,7 +87,6 @@ public class NoticeEntity extends DomainObject {
     /**
      * 最后一次修改人用户ID
      */
-
     private Integer updateUserid;
 
     /**
@@ -101,7 +98,6 @@ public class NoticeEntity extends DomainObject {
     /**
      * 最后一次修改时间
      */
-
     private java.util.Date updateTime;
 
     /**
@@ -396,16 +392,17 @@ public class NoticeEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("Title",
-                                                                                                      getTitle()).append(
-            "Content", getContent()).append("Top", getTop()).append("Red", getRed()).append("CreateUserid",
-                                                                                            getCreateUserid()).append(
-            "CreateUsername", getCreateUsername()).append("CreateTime", getCreateTime()).append("CreateIp",
-                                                                                                getCreateIp()).append(
-            "UpdateUserid", getUpdateUserid()).append("UpdateUsername", getUpdateUsername()).append("UpdateTime",
-                                                                                                    getUpdateTime()).append(
-            "UpdateIp", getUpdateIp()).toString();
+                getTitle()).append(
+                "Content", getContent()).append("Top", getTop()).append("Red", getRed()).append("CreateUserid",
+                getCreateUserid()).append(
+                "CreateUsername", getCreateUsername()).append("CreateTime", getCreateTime()).append("CreateIp",
+                getCreateIp()).append(
+                "UpdateUserid", getUpdateUserid()).append("UpdateUsername", getUpdateUsername()).append("UpdateTime",
+                getUpdateTime()).append(
+                "UpdateIp", getUpdateIp()).toString();
     }
 
     /**
@@ -413,6 +410,7 @@ public class NoticeEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -423,11 +421,14 @@ public class NoticeEntity extends DomainObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof NoticeEntity == false)
+        if (obj instanceof NoticeEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         NoticeEntity other = (NoticeEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/PermissionEntity.java

@@ -52,13 +52,11 @@ public class PermissionEntity extends DomainObject {
     /**
      * 父菜单ID
      */
-
     protected Integer parentId;
 
     /**
      * 排序
      */
-
     protected Integer orderNum;
 
     /**
@@ -70,7 +68,6 @@ public class PermissionEntity extends DomainObject {
     /**
      * 1 菜单 2 页面 3 操作
      */
-
     protected java.lang.Integer type;
 
     /**
@@ -113,7 +110,6 @@ public class PermissionEntity extends DomainObject {
     /**
      * 最后一次修改人用户ID
      */
-
     protected Integer updateUserid;
 
     /**
@@ -125,7 +121,6 @@ public class PermissionEntity extends DomainObject {
     /**
      * 最后一次修改时间
      */
-
     protected java.util.Date updateTime;
 
     /**
@@ -463,17 +458,18 @@ public class PermissionEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("Code",
-                                                                                                      getCode()).append(
-            "Name", getName()).append("ParentId", getParentId()).append("OrderNum", getOrderNum()).append("Resource",
-                                                                                                          getResource()).append(
-            "Type", getType()).append("CreateUserid", getCreateUserid()).append("CreateUsername",
-                                                                                getCreateUsername()).append(
-            "CreateTime", getCreateTime()).append("CreateIp", getCreateIp()).append("UpdateUserid",
-                                                                                    getUpdateUserid()).append(
-            "UpdateUsername", getUpdateUsername()).append("UpdateTime", getUpdateTime()).append("UpdateIp",
-                                                                                                getUpdateIp()).toString();
+                getCode()).append(
+                "Name", getName()).append("ParentId", getParentId()).append("OrderNum", getOrderNum()).append("Resource",
+                getResource()).append(
+                "Type", getType()).append("CreateUserid", getCreateUserid()).append("CreateUsername",
+                getCreateUsername()).append(
+                "CreateTime", getCreateTime()).append("CreateIp", getCreateIp()).append("UpdateUserid",
+                getUpdateUserid()).append(
+                "UpdateUsername", getUpdateUsername()).append("UpdateTime", getUpdateTime()).append("UpdateIp",
+                getUpdateIp()).toString();
     }
 
     /**
@@ -481,6 +477,7 @@ public class PermissionEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -491,11 +488,14 @@ public class PermissionEntity extends DomainObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof PermissionEntity == false)
+        if (obj instanceof PermissionEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         PermissionEntity other = (PermissionEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/ProjectDynamicEntity.java

@@ -16,7 +16,6 @@ public class ProjectDynamicEntity extends DomainObject {
 
     private List picList;
 
-//    private Integer id;
     private Integer projectId;
     private String projectName;
     private Integer createUserid;
@@ -71,16 +70,6 @@ public class ProjectDynamicEntity extends DomainObject {
         this.picList = picList;
     }
 
-//    @Override
-//    public Integer getId() {
-//        return id;
-//    }
-//
-//    @Override
-//    public void setId(Integer id) {
-//        this.id = id;
-//    }
-
     public Integer getProjectId() {
         return projectId;
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/ProjectLogEntity.java

@@ -5,6 +5,8 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
+ * 项目操作日志信息表
+ *
  * @author Created by Administrator on 2019/8/12.
  */
 public class ProjectLogEntity extends DomainObject {

house365-hgs-beans/src/main/java/com/house365/beans/entity/ProjectSalerEntity.java

@@ -2,10 +2,11 @@
  * Description: ProjectSaler数据库实体/领域对象
  * Copyright:   Copyright (c)2018
  * Company:     江苏三六五网络股份有限公司
+ *
  * @author: 江苏三六五网络股份有限公司
  * @version: 1.0
  * Create at:   2018-02-01 上午 09:10:32
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -22,7 +23,7 @@ import org.hibernate.validator.constraints.Length;
 
 /**
  * ProjectSaler数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2018-02-01
  * @see
@@ -39,7 +40,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 项目ID
      */
-
     private Integer projectId;
 
     /**
@@ -57,7 +57,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 直销人员ID
      */
-
     private Integer userId;
 
     /**
@@ -69,7 +68,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 创建人用户ID
      */
-
     private Integer createUserid;
 
     /**
@@ -81,7 +79,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 创建时间
      */
-
     private java.util.Date createTime;
 
     /**
@@ -93,7 +90,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 最后一次修改人用户ID
      */
-
     private Integer updateUserid;
 
     /**
@@ -105,7 +101,6 @@ public class ProjectSalerEntity extends DomainObject {
     /**
      * 最后一次修改时间
      */
-
     private java.util.Date updateTime;
 
     /**
@@ -126,18 +121,6 @@ public class ProjectSalerEntity extends DomainObject {
     @Length(max = 100, message = "长度需要大于0且小于100")
     private String city;
 
-    //columns END
-    /*
-	public ProjectSaler(){
-	}
-
-	public ProjectSaler(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
 
     /**
      * 获取项目ID
@@ -428,6 +411,7 @@ public class ProjectSalerEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("Id", getId())
@@ -454,24 +438,30 @@ public class ProjectSalerEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
                 .toHashCode();
     }
 
-	/**
+    /**
      * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof ProjectSalerEntity == false) return false;
-		if(this == obj) return true;
-		ProjectSalerEntity other = (ProjectSalerEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ProjectSalerEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ProjectSalerEntity other = (ProjectSalerEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/ProjectSourceStatisticsEntity.java

@@ -14,14 +14,13 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
-
-import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
 
 /**
  * ProjectSourceStatistics数据库实体/领域对象<br>
@@ -32,9 +31,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @since 1.0
  */
 public class ProjectSourceStatisticsEntity extends StatisticObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -42,7 +39,6 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
     /**
      * 项目ID
      */
-
     private Integer projectId;
 
     /**
@@ -60,13 +56,11 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
     /**
      * 客户数量
      */
-
     private Integer customerNum;
 
     /**
      * 来源ID
      */
-
     private Integer sourceId;
 
     /**
@@ -98,20 +92,9 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
     /**
      * 创建时间
      */
-    private java.util.Date createTime;
+    private Date createTime;
 
     //columns END
-  /*
-  public ProjectSourceStatistics(){
-	}
-
-	public ProjectSourceStatistics(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
 
     public String getObjectType() {
         return objectType;
@@ -288,7 +271,7 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
      *
      * @param createTime 创建时间
      */
-    public void setCreateTime(java.util.Date createTime) {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
@@ -312,7 +295,7 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
      *
      * @return 创建时间
      */
-    public java.util.Date getCreateTime() {
+    public Date getCreateTime() {
         return this.createTime;
     }
 
@@ -321,14 +304,15 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("ProjectId",
-                                                                                                      getProjectId()).append(
-            "ProjectName", getProjectName()).append("CustomerStatus", getCustomerStatus()).append("CustomerNum",
-                                                                                                  getCustomerNum()).append(
-            "SourceId", getSourceId()).append("SourceName", getSourceName()).append("City", getCity()).append(
-            "CityName", getCityName()).append("DayBaseRatio", getDayBaseRatio()).append("CreateTime",
-                                                                                        getCreateTime()).toString();
+                getProjectId()).append(
+                "ProjectName", getProjectName()).append("CustomerStatus", getCustomerStatus()).append("CustomerNum",
+                getCustomerNum()).append(
+                "SourceId", getSourceId()).append("SourceName", getSourceName()).append("City", getCity()).append(
+                "CityName", getCityName()).append("DayBaseRatio", getDayBaseRatio()).append("CreateTime",
+                getCreateTime()).toString();
     }
 
     /**
@@ -336,6 +320,7 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -346,11 +331,14 @@ public class ProjectSourceStatisticsEntity extends StatisticObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof ProjectSourceStatisticsEntity == false)
+        if (obj instanceof ProjectSourceStatisticsEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         ProjectSourceStatisticsEntity other = (ProjectSourceStatisticsEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/ProjectUserEntity.java

@@ -2,10 +2,11 @@
  * Description: ProjectUser数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-09-18 上午 10:05:26
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,392 +14,411 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 /**
+ * 驻场用户实体类
  * ProjectUser数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-09-18
  * @see
  * @since 1.0
  */
-public class ProjectUserEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 项目ID
-	 */
-	private Integer projectId;
-	
-	/**
-	 * 项目编号
-	 */
-	@Length(max=50, message="长度需要大于0且小于50")
-	private String projectCode;
-	
-	/**
-	 * 项目名称
-	 */
-	@Length(max=50, message="长度需要大于0且小于50")
-	private String projectName;
-	
-	/**
-	 * 驻场ID
-	 */
-	
-	private Integer userId;
-	
-	/**
-	 * 驻场名称
-	 */
-	@Length(max=50, message="长度需要大于0且小于50")
-	private String userName;
-	
-	/**
-	 * 创建人用户ID
-	 */
-	
-	private Integer createUserid;
-	
-	/**
-	 * 创建人用户名
-	 */
-	@Length(max=100, message="长度需要大于0且小于100")
-	private String createUsername;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	/**
-	 * 创建人电脑IP
-	 */
-	@Length(max=30, message="长度需要大于0且小于30")
-	private String createIp;
-	
-	/**
-	 * 最后一次修改人用户ID
-	 */
-	
-	private Integer updateUserid;
-	
-	/**
-	 * 最后一次修改人用户名
-	 */
-	@Length(max=100, message="长度需要大于0且小于100")
-	private String updateUsername;
-	
-	/**
-	 * 最后一次修改时间
-	 */
-	
-	private java.util.Date updateTime;
-	
-	/**
-	 * 最后一次修改人电脑IP
-	 */
-	@Length(max=30, message="长度需要大于0且小于30")
-	private String updateIp;
-	
-	//columns END
-	/*
-	public ProjectUser(){
-	}
-
-	public ProjectUser(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-	/**
-	 * 设置项目编号
-	 * @param projectCode 项目编号
-	 */
-	public void setProjectCode(String projectCode) {
-		this.projectCode = projectCode;
-	}
-
-	public Integer getProjectId() {
-		return projectId;
-	}
-
-	public void setProjectId(Integer projectId) {
-		this.projectId = projectId;
-	}
-
-	/**
-	 * 获取项目编号
-	 * @return 项目编号
-	 */
-	public String getProjectCode() {
-		return this.projectCode;
-	}
-
-	/**
-	 * 设置项目名称
-	 * @param projectName 项目名称
-	 */
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-
-	/**
-	 * 获取项目名称
-	 * @return 项目名称
-	 */
-	public String getProjectName() {
-		return this.projectName;
-	}
-
-	/**
-	 * 设置驻场ID
-	 * @param userId 驻场ID
-	 */
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	/**
-	 * 获取驻场ID
-	 * @return 驻场ID
-	 */
-	public Integer getUserId() {
-		return this.userId;
-	}
-
-	/**
-	 * 设置驻场名称
-	 * @param userName 驻场名称
-	 */
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	/**
-	 * 获取驻场名称
-	 * @return 驻场名称
-	 */
-	public String getUserName() {
-		return this.userName;
-	}
-
-	/**
-	 * 设置创建人用户ID
-	 * @param createUserid 创建人用户ID
-	 */
-	public void setCreateUserid(Integer createUserid) {
-		this.createUserid = createUserid;
-	}
-
-	/**
-	 * 获取创建人用户ID
-	 * @return 创建人用户ID
-	 */
-	public Integer getCreateUserid() {
-		return this.createUserid;
-	}
-
-	/**
-	 * 设置创建人用户名
-	 * @param createUsername 创建人用户名
-	 */
-	public void setCreateUsername(String createUsername) {
-		this.createUsername = createUsername;
-	}
-
-	/**
-	 * 获取创建人用户名
-	 * @return 创建人用户名
-	 */
-	public String getCreateUsername() {
-		return this.createUsername;
-	}
-
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	/**
-	 * 设置创建人电脑IP
-	 * @param createIp 创建人电脑IP
-	 */
-	public void setCreateIp(String createIp) {
-		this.createIp = createIp;
-	}
-
-	/**
-	 * 获取创建人电脑IP
-	 * @return 创建人电脑IP
-	 */
-	public String getCreateIp() {
-		return this.createIp;
-	}
-
-	/**
-	 * 设置最后一次修改人用户ID
-	 * @param updateUserid 最后一次修改人用户ID
-	 */
-	public void setUpdateUserid(Integer updateUserid) {
-		this.updateUserid = updateUserid;
-	}
-
-	/**
-	 * 获取最后一次修改人用户ID
-	 * @return 最后一次修改人用户ID
-	 */
-	public Integer getUpdateUserid() {
-		return this.updateUserid;
-	}
-
-	/**
-	 * 设置最后一次修改人用户名
-	 * @param updateUsername 最后一次修改人用户名
-	 */
-	public void setUpdateUsername(String updateUsername) {
-		this.updateUsername = updateUsername;
-	}
-
-	/**
-	 * 获取最后一次修改人用户名
-	 * @return 最后一次修改人用户名
-	 */
-	public String getUpdateUsername() {
-		return this.updateUsername;
-	}
-
-	/**
-	 * 设置最后一次修改时间
-	 * @param updateTime 最后一次修改时间
-	 */
-	public void setUpdateTime(java.util.Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	/**
-	 * 设置最后一次修改时间字符串格式
-	 * @param updateTime 最后一次修改时间
-	 */
-	public void setUpdateTimeStr(String updateTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(updateTime)) {
-			try {
-				this.updateTime = java.text.DateFormat.getDateTimeInstance().parse(updateTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 获取最后一次修改时间
-	 * @return 最后一次修改时间
-	 */
-	public java.util.Date getUpdateTime() {
-		return this.updateTime;
-	}
-
-	/**
-	 * 设置最后一次修改人电脑IP
-	 * @param updateIp 最后一次修改人电脑IP
-	 */
-	public void setUpdateIp(String updateIp) {
-		this.updateIp = updateIp;
-	}
-
-	/**
-	 * 获取最后一次修改人电脑IP
-	 * @return 最后一次修改人电脑IP
-	 */
-	public String getUpdateIp() {
-		return this.updateIp;
-	}
+public class ProjectUserEntity extends DomainObject {
+
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 项目ID
+     */
+    private Integer projectId;
+
+    /**
+     * 项目编号
+     */
+    @Length(max = 50, message = "长度需要大于0且小于50")
+    private String projectCode;
+
+    /**
+     * 项目名称
+     */
+    @Length(max = 50, message = "长度需要大于0且小于50")
+    private String projectName;
+
+    /**
+     * 驻场ID
+     */
+    private Integer userId;
+
+    /**
+     * 驻场名称
+     */
+    @Length(max = 50, message = "长度需要大于0且小于50")
+    private String userName;
+
+    /**
+     * 创建人用户ID
+     */
+    private Integer createUserid;
+
+    /**
+     * 创建人用户名
+     */
+    @Length(max = 100, message = "长度需要大于0且小于100")
+    private String createUsername;
+
+    /**
+     * 创建时间
+     */
+    private java.util.Date createTime;
+
+    /**
+     * 创建人电脑IP
+     */
+    @Length(max = 30, message = "长度需要大于0且小于30")
+    private String createIp;
+
+    /**
+     * 最后一次修改人用户ID
+     */
+    private Integer updateUserid;
+
+    /**
+     * 最后一次修改人用户名
+     */
+    @Length(max = 100, message = "长度需要大于0且小于100")
+    private String updateUsername;
+
+    /**
+     * 最后一次修改时间
+     */
+    private java.util.Date updateTime;
+
+    /**
+     * 最后一次修改人电脑IP
+     */
+    @Length(max = 30, message = "长度需要大于0且小于30")
+    private String updateIp;
+
+    //columns END
+
+    /**
+     * 设置项目编号
+     *
+     * @param projectCode 项目编号
+     */
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    /**
+     * 获取项目编号
+     *
+     * @return 项目编号
+     */
+    public String getProjectCode() {
+        return this.projectCode;
+    }
+
+    /**
+     * 设置项目名称
+     *
+     * @param projectName 项目名称
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    /**
+     * 获取项目名称
+     *
+     * @return 项目名称
+     */
+    public String getProjectName() {
+        return this.projectName;
+    }
+
+    /**
+     * 设置驻场ID
+     *
+     * @param userId 驻场ID
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取驻场ID
+     *
+     * @return 驻场ID
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * 设置驻场名称
+     *
+     * @param userName 驻场名称
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 获取驻场名称
+     *
+     * @return 驻场名称
+     */
+    public String getUserName() {
+        return this.userName;
+    }
+
+    /**
+     * 设置创建人用户ID
+     *
+     * @param createUserid 创建人用户ID
+     */
+    public void setCreateUserid(Integer createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    /**
+     * 获取创建人用户ID
+     *
+     * @return 创建人用户ID
+     */
+    public Integer getCreateUserid() {
+        return this.createUserid;
+    }
+
+    /**
+     * 设置创建人用户名
+     *
+     * @param createUsername 创建人用户名
+     */
+    public void setCreateUsername(String createUsername) {
+        this.createUsername = createUsername;
+    }
+
+    /**
+     * 获取创建人用户名
+     *
+     * @return 创建人用户名
+     */
+    public String getCreateUsername() {
+        return this.createUsername;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 设置创建时间字符串格式
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置创建人电脑IP
+     *
+     * @param createIp 创建人电脑IP
+     */
+    public void setCreateIp(String createIp) {
+        this.createIp = createIp;
+    }
+
+    /**
+     * 获取创建人电脑IP
+     *
+     * @return 创建人电脑IP
+     */
+    public String getCreateIp() {
+        return this.createIp;
+    }
+
+    /**
+     * 设置最后一次修改人用户ID
+     *
+     * @param updateUserid 最后一次修改人用户ID
+     */
+    public void setUpdateUserid(Integer updateUserid) {
+        this.updateUserid = updateUserid;
+    }
+
+    /**
+     * 获取最后一次修改人用户ID
+     *
+     * @return 最后一次修改人用户ID
+     */
+    public Integer getUpdateUserid() {
+        return this.updateUserid;
+    }
+
+    /**
+     * 设置最后一次修改人用户名
+     *
+     * @param updateUsername 最后一次修改人用户名
+     */
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername;
+    }
+
+    /**
+     * 获取最后一次修改人用户名
+     *
+     * @return 最后一次修改人用户名
+     */
+    public String getUpdateUsername() {
+        return this.updateUsername;
+    }
+
+    /**
+     * 设置最后一次修改时间
+     *
+     * @param updateTime 最后一次修改时间
+     */
+    public void setUpdateTime(java.util.Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 设置最后一次修改时间字符串格式
+     *
+     * @param updateTime 最后一次修改时间
+     */
+    public void setUpdateTimeStr(String updateTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(updateTime)) {
+            try {
+                this.updateTime = java.text.DateFormat.getDateTimeInstance().parse(updateTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取最后一次修改时间
+     *
+     * @return 最后一次修改时间
+     */
+    public java.util.Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    /**
+     * 设置最后一次修改人电脑IP
+     *
+     * @param updateIp 最后一次修改人电脑IP
+     */
+    public void setUpdateIp(String updateIp) {
+        this.updateIp = updateIp;
+    }
+
+    /**
+     * 获取最后一次修改人电脑IP
+     *
+     * @return 最后一次修改人电脑IP
+     */
+    public String getUpdateIp() {
+        return this.updateIp;
+    }
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ProjectId",getProjectId())
-			.append("ProjectCode",getProjectCode())
-			.append("ProjectName",getProjectName())
-			.append("UserId",getUserId())
-			.append("UserName",getUserName())
-			.append("CreateUserid",getCreateUserid())
-			.append("CreateUsername",getCreateUsername())
-			.append("CreateTime",getCreateTime())
-			.append("CreateIp",getCreateIp())
-			.append("UpdateUserid",getUpdateUserid())
-			.append("UpdateUsername",getUpdateUsername())
-			.append("UpdateTime",getUpdateTime())
-			.append("UpdateIp",getUpdateIp())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof ProjectUserEntity == false) return false;
-		if(this == obj) return true;
-		ProjectUserEntity other = (ProjectUserEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("ProjectId", getProjectId())
+                .append("ProjectCode", getProjectCode())
+                .append("ProjectName", getProjectName())
+                .append("UserId", getUserId())
+                .append("UserName", getUserName())
+                .append("CreateUserid", getCreateUserid())
+                .append("CreateUsername", getCreateUsername())
+                .append("CreateTime", getCreateTime())
+                .append("CreateIp", getCreateIp())
+                .append("UpdateUserid", getUpdateUserid())
+                .append("UpdateUsername", getUpdateUsername())
+                .append("UpdateTime", getUpdateTime())
+                .append("UpdateIp", getUpdateIp())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     *
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     *
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ProjectUserEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ProjectUserEntity other = (ProjectUserEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/ReceiveCallRecordEntity.java

@@ -21,6 +21,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * 回访录音记录数据库实体/领域对象<br>
  *
@@ -30,9 +32,7 @@ import org.hibernate.validator.constraints.Length;
  * @since 1.0
  */
 public class ReceiveCallRecordEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -46,25 +46,21 @@ public class ReceiveCallRecordEntity extends DomainObject {
     /**
      * 业务
      */
-
     private Integer pid;
 
     /**
      * 通话开始时间
      */
-
     private java.util.Date startTime;
 
     /**
      * 通话结束时间
      */
-
     private java.util.Date endTime;
 
     /**
      * 通话时长（秒）
      */
-
     private Integer duration;
 
     /**
@@ -80,17 +76,6 @@ public class ReceiveCallRecordEntity extends DomainObject {
     private Integer status;
 
     //columns END
-    /*
-	public ReciveCallRecord(){
-	}
-
-	public ReciveCallRecord(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
 
     public String getCaller() {
         return caller;
@@ -102,6 +87,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取业务
+     *
      * @return 业务
      */
     public Integer getPid() {
@@ -110,6 +96,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 设置业务
+     *
      * @param pid 业务
      */
     public void setPid(Integer pid) {
@@ -118,6 +105,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 设置通话开始时间字符串格式
+     *
      * @param startTime 通话开始时间
      */
     public void setStartTimeStr(String startTime) {
@@ -132,22 +120,25 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取通话开始时间
+     *
      * @return 通话开始时间
      */
-    public java.util.Date getStartTime() {
+    public Date getStartTime() {
         return this.startTime;
     }
 
     /**
      * 设置通话开始时间
+     *
      * @param startTime 通话开始时间
      */
-    public void setStartTime(java.util.Date startTime) {
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
 
     /**
      * 设置通话结束时间字符串格式
+     *
      * @param endTime 通话结束时间
      */
     public void setEndTimeStr(String endTime) {
@@ -162,22 +153,25 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取通话结束时间
+     *
      * @return 通话结束时间
      */
-    public java.util.Date getEndTime() {
+    public Date getEndTime() {
         return this.endTime;
     }
 
     /**
      * 设置通话结束时间
+     *
      * @param endTime 通话结束时间
      */
-    public void setEndTime(java.util.Date endTime) {
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
 
     /**
      * 获取通话时长（秒）
+     *
      * @return 通话时长（秒）
      */
     public Integer getDuration() {
@@ -186,6 +180,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 设置通话时长（秒）
+     *
      * @param duration 通话时长（秒）
      */
     public void setDuration(Integer duration) {
@@ -194,6 +189,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取录音文件名
+     *
      * @return 录音文件名
      */
     public String getRecord() {
@@ -202,6 +198,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 设置录音文件名
+     *
      * @param record 录音文件名
      */
     public void setRecord(String record) {
@@ -210,6 +207,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取接通状态 1接通 0未接通
+     *
      * @return 接通状态 1接通 0未接通
      */
     public Integer getStatus() {
@@ -218,6 +216,7 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 设置接通状态 1接通 0未接通
+     *
      * @param status 接通状态 1接通 0未接通
      */
     public void setStatus(Integer status) {
@@ -226,8 +225,10 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("Id", getId())
@@ -243,8 +244,10 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 获取hash码
+     *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -253,12 +256,18 @@ public class ReceiveCallRecordEntity extends DomainObject {
 
     /**
      * 对象比较
+     *
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof ReceiveCallRecordEntity == false) return false;
-        if (this == obj) return true;
+        if (obj instanceof ReceiveCallRecordEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
         ReceiveCallRecordEntity other = (ReceiveCallRecordEntity) obj;
         return new EqualsBuilder()
                 .append(getId(), other.getId())

house365-hgs-beans/src/main/java/com/house365/beans/entity/ReportChannelDepartRelEntity.java

@@ -2,10 +2,11 @@
  * Description: ReportChannelDepartRel数据库实体/领域对象
  * Copyright:   Copyright (c)2017
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2017-07-17 上午 10:14:20
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,121 +14,116 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * ReportChannelDepartRel数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-07-17
  * @see
  * @since 1.0
  */
-public class ReportChannelDepartRelEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * channelId
-	 */
-	@NotNull 
-	private Integer channelId;
-	
-	/**
-	 * departId
-	 */
-	@NotNull 
-	private Integer departId;
-	
-	//columns END
-	/*
-	public ReportChannelDepartRel(){
-	}
-
-	public ReportChannelDepartRel(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
-	/**
-	 * 设置channelId
-	 * @param channelId channelId
-	 */
-	public void setChannelId(Integer channelId) {
-		this.channelId = channelId;
-	}
-
-	/**
-	 * 获取channelId
-	 * @return channelId
-	 */
-	public Integer getChannelId() {
-		return this.channelId;
-	}
-
-	/**
-	 * 设置departId
-	 * @param departId departId
-	 */
-	public void setDepartId(Integer departId) {
-		this.departId = departId;
-	}
-
-	/**
-	 * 获取departId
-	 * @return departId
-	 */
-	public Integer getDepartId() {
-		return this.departId;
-	}
+public class ReportChannelDepartRelEntity extends DomainObject {
+
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * channelId
+     */
+    @NotNull
+    private Integer channelId;
+
+    /**
+     * departId
+     */
+    @NotNull
+    private Integer departId;
+
+    //columns END
+
+
+    /**
+     * 设置channelId
+     * @param channelId channelId
+     */
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * 获取channelId
+     * @return channelId
+     */
+    public Integer getChannelId() {
+        return this.channelId;
+    }
+
+    /**
+     * 设置departId
+     * @param departId departId
+     */
+    public void setDepartId(Integer departId) {
+        this.departId = departId;
+    }
+
+    /**
+     * 获取departId
+     * @return departId
+     */
+    public Integer getDepartId() {
+        return this.departId;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ChannelId",getChannelId())
-			.append("DepartId",getDepartId())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof ReportChannelDepartRelEntity == false) return false;
-		if(this == obj) return true;
-		ReportChannelDepartRelEntity other = (ReportChannelDepartRelEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("ChannelId", getChannelId())
+                .append("DepartId", getDepartId())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ReportChannelDepartRelEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ReportChannelDepartRelEntity other = (ReportChannelDepartRelEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/ReportChannelEntity.java

@@ -31,9 +31,7 @@ import org.hibernate.validator.constraints.NotBlank;
  * @since 1.0
  */
 public class ReportChannelEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -85,17 +83,6 @@ public class ReportChannelEntity extends DomainObject {
     private Integer status;
 
     //columns END
-  /*
-  public ReportChannel(){
-	}
-
-	public ReportChannel(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
 
     /**
      * 设置名称
@@ -276,13 +263,14 @@ public class ReportChannelEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("Name",
-                                                                                                      getName()).append(
-            "ChannelType", getChannelType()).append("Creater", getCreater()).append("CreateTime",
-                                                                                    getCreateTime()).append(
-            "LastModifier", getLastModifier()).append("UpateTime", getUpateTime()).append("City", getCity()).append(
-            "Status", getStatus()).toString();
+                getName()).append(
+                "ChannelType", getChannelType()).append("Creater", getCreater()).append("CreateTime",
+                getCreateTime()).append(
+                "LastModifier", getLastModifier()).append("UpateTime", getUpateTime()).append("City", getCity()).append(
+                "Status", getStatus()).toString();
     }
 
     /**
@@ -290,6 +278,7 @@ public class ReportChannelEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -300,11 +289,14 @@ public class ReportChannelEntity extends DomainObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof ReportChannelEntity == false)
+        if (obj instanceof ReportChannelEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         ReportChannelEntity other = (ReportChannelEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/ReportMarketingEntity.java

@@ -2,10 +2,11 @@
  * Description: 营销日报数据库实体/领域对象
  * Copyright:   Copyright (c)2017
  * Company:     江苏三六五网络股份有限公司
+ *
  * @author: 江苏三六五网络股份有限公司
  * @version: 1.0
  * Create at:   2017-08-08 下午 17:15:44
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -22,16 +23,14 @@ import org.hibernate.validator.constraints.Length;
 
 /**
  * 营销日报数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-08-08
  * @see
  * @since 1.0
  */
 public class ReportMarketingEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -39,19 +38,16 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 电话接触量
      */
-
     private Integer callCount;
 
     /**
      * 电话接通量
      */
-
     private Integer connectCount;
 
     /**
      * 意向沉淀量
      */
-
     private Integer intentBuyCount;
 
     private Integer twiceVisitedCount;
@@ -87,13 +83,11 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 到访量
      */
-
     private Integer visitedCount;
 
     /**
      * 认筹量
      */
-
     private Integer identificationChipsCount;
 
     /**
@@ -105,7 +99,6 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 认购量
      */
-
     private Integer subscriptionCount;
 
     /**
@@ -117,19 +110,16 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 业绩
      */
-
     private Integer source;
 
     /**
      * 创建时间
      */
-
     private java.util.Date createTime;
 
     /**
      * 部门id
      */
-
     private Integer departmentId;
 
     /**
@@ -141,7 +131,6 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 职员id
      */
-
     private Integer userId;
 
     /**
@@ -153,7 +142,6 @@ public class ReportMarketingEntity extends DomainObject {
     /**
      * 报告时间
      */
-
     private java.util.Date reportTime;
 
     /**
@@ -161,17 +149,7 @@ public class ReportMarketingEntity extends DomainObject {
      */
     private String city;
     //columns END
-    /*
-	public ReportMarketing(){
-	}
-
-	public ReportMarketing(
-		Integer id
-	){
-		this.id = id;
-	}
 
-    */
 
     /**
      * 获取电话接触量
@@ -475,6 +453,7 @@ public class ReportMarketingEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("Id", getId())
@@ -496,28 +475,34 @@ public class ReportMarketingEntity extends DomainObject {
                 .toString();
     }
 
-	/**
+    /**
      * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
      * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof ReportMarketingEntity == false) return false;
-		if(this == obj) return true;
-		ReportMarketingEntity other = (ReportMarketingEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ReportMarketingEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ReportMarketingEntity other = (ReportMarketingEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/RoleEntity.java

@@ -30,9 +30,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @since 1.0
  */
 public class RoleEntity extends DomainObject{
-	/**
-	 * 
-	 */
+
 	private static final long serialVersionUID = 1L;
 	
 	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -68,7 +66,6 @@ public class RoleEntity extends DomainObject{
 	/**
 	 * 创建人用户ID
 	 */
-	
 	private Integer createUserid;
 	
 	/**
@@ -80,7 +77,6 @@ public class RoleEntity extends DomainObject{
 	/**
 	 * 创建时间
 	 */
-	
 	private java.util.Date createTime;
 	
 	/**
@@ -92,7 +88,6 @@ public class RoleEntity extends DomainObject{
 	/**
 	 * 最后一次修改人用户ID
 	 */
-	
 	private Integer updateUserid;
 	
 	/**
@@ -104,7 +99,6 @@ public class RoleEntity extends DomainObject{
 	/**
 	 * 最后一次修改时间
 	 */
-	
 	private java.util.Date updateTime;
 	
 	/**
@@ -114,17 +108,6 @@ public class RoleEntity extends DomainObject{
 	private String updateIp;
 	
 	//columns END
-	/*
-	public Role(){
-	}
-
-	public Role(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
 
 	/**
 	 * 设置编码

house365-hgs-beans/src/main/java/com/house365/beans/entity/RolePermissionEntity.java

@@ -2,10 +2,11 @@
  * Description: 角色权限关联数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-09-22 上午 11:32:19
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,209 +14,204 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 角色权限关联数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-09-22
  * @see
  * @since 1.0
  */
-public class RolePermissionEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * roleId
-	 */
-	@NotNull 
-	private Integer roleId;
-	
-	/**
-	 * permissionId
-	 */
-	@NotNull 
-	private Integer permissionId;
-	
-	private String permissionName;
-	private String permissionCode;
-	private Integer hierarchy;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	/**
-	 * 创建人用户ID
-	 */
-	
-	private Integer createUserid;
-	
-	//columns END
-	/*
-	public RolePermission(){
-	}
-
-	public RolePermission(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-	
-	/**
-	 * 设置roleId
-	 * @param roleId roleId
-	 */
-	public void setRoleId(Integer roleId) {
-		this.roleId = roleId;
-	}
-
-	public Integer getHierarchy() {
-		return hierarchy;
-	}
-
-	public void setHierarchy(Integer hierarchy) {
-		this.hierarchy = hierarchy;
-	}
-
-	public String getPermissionName() {
-		return permissionName;
-	}
-
-	public void setPermissionName(String permissionName) {
-		this.permissionName = permissionName;
-	}
-
-	public String getPermissionCode() {
-		return permissionCode;
-	}
-
-	public void setPermissionCode(String permissionCode) {
-		this.permissionCode = permissionCode;
-	}
-
-	/**
-	 * 获取roleId
-	 * @return roleId
-	 */
-	public Integer getRoleId() {
-		return this.roleId;
-	}
-
-	/**
-	 * 设置permissionId
-	 * @param permissionId permissionId
-	 */
-	public void setPermissionId(Integer permissionId) {
-		this.permissionId = permissionId;
-	}
-
-	/**
-	 * 获取permissionId
-	 * @return permissionId
-	 */
-	public Integer getPermissionId() {
-		return this.permissionId;
-	}
-
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	/**
-	 * 设置创建人用户ID
-	 * @param createUserid 创建人用户ID
-	 */
-	public void setCreateUserid(Integer createUserid) {
-		this.createUserid = createUserid;
-	}
-
-	/**
-	 * 获取创建人用户ID
-	 * @return 创建人用户ID
-	 */
-	public Integer getCreateUserid() {
-		return this.createUserid;
-	}
+public class RolePermissionEntity extends DomainObject {
+
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * roleId
+     */
+    @NotNull
+    private Integer roleId;
+
+    /**
+     * permissionId
+     */
+    @NotNull
+    private Integer permissionId;
+
+    private String permissionName;
+    private String permissionCode;
+    private Integer hierarchy;
+
+    /**
+     * 创建时间
+     */
+
+    private java.util.Date createTime;
+
+    /**
+     * 创建人用户ID
+     */
+
+    private Integer createUserid;
+
+    //columns END
+
+
+    /**
+     * 设置roleId
+     * @param roleId roleId
+     */
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getHierarchy() {
+        return hierarchy;
+    }
+
+    public void setHierarchy(Integer hierarchy) {
+        this.hierarchy = hierarchy;
+    }
+
+    public String getPermissionName() {
+        return permissionName;
+    }
+
+    public void setPermissionName(String permissionName) {
+        this.permissionName = permissionName;
+    }
+
+    public String getPermissionCode() {
+        return permissionCode;
+    }
+
+    public void setPermissionCode(String permissionCode) {
+        this.permissionCode = permissionCode;
+    }
+
+    /**
+     * 获取roleId
+     * @return roleId
+     */
+    public Integer getRoleId() {
+        return this.roleId;
+    }
+
+    /**
+     * 设置permissionId
+     * @param permissionId permissionId
+     */
+    public void setPermissionId(Integer permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    /**
+     * 获取permissionId
+     * @return permissionId
+     */
+    public Integer getPermissionId() {
+        return this.permissionId;
+    }
+
+    /**
+     * 设置创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 设置创建时间字符串格式
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取创建时间
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置创建人用户ID
+     * @param createUserid 创建人用户ID
+     */
+    public void setCreateUserid(Integer createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    /**
+     * 获取创建人用户ID
+     * @return 创建人用户ID
+     */
+    public Integer getCreateUserid() {
+        return this.createUserid;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("RoleId",getRoleId())
-			.append("PermissionId",getPermissionId())
-			.append("CreateTime",getCreateTime())
-			.append("CreateUserid",getCreateUserid())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof RolePermissionEntity == false) return false;
-		if(this == obj) return true;
-		RolePermissionEntity other = (RolePermissionEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("RoleId", getRoleId())
+                .append("PermissionId", getPermissionId())
+                .append("CreateTime", getCreateTime())
+                .append("CreateUserid", getCreateUserid())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof RolePermissionEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        RolePermissionEntity other = (RolePermissionEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/SignUpTrackEntity.java

@@ -5,9 +5,9 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
- * @author
- * Created by Administrator on 2019/11/6.
  * crm报名轨迹实体类
+ *
+ * @author Created by Administrator on 2019/11/6.
  */
 public class SignUpTrackEntity extends DomainObject {
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/StatisticEntity.java

@@ -14,14 +14,15 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
-
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 统计信息数据库实体/领域对象<br>
@@ -32,9 +33,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @since 1.0
  */
 public class StatisticEntity extends DomainObject {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -284,13 +283,14 @@ public class StatisticEntity extends DomainObject {
      *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("Id", getId()).append("Sort",
-                                                                                                      getSort()).append(
-            "Name", getName()).append("Group", getGroup()).append("Performance", getPerformance()).append("BuyNum",
-                                                                                                          getBuyNum()).append(
-            "CreateTime", getCreateTime()).append("Creater", getCreater()).append("ReportName",
-                                                                                  getReportName()).toString();
+                getSort()).append(
+                "Name", getName()).append("Group", getGroup()).append("Performance", getPerformance()).append("BuyNum",
+                getBuyNum()).append(
+                "CreateTime", getCreateTime()).append("Creater", getCreater()).append("ReportName",
+                getReportName()).toString();
     }
 
     /**
@@ -298,6 +298,7 @@ public class StatisticEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getId()).toHashCode();
     }
@@ -308,11 +309,14 @@ public class StatisticEntity extends DomainObject {
      * @param obj 待比较对象
      * @return 是否相同<li>true--相同<li>false--不相同
      */
+    @Override
     public boolean equals(Object obj) {
-        if (obj instanceof StatisticEntity == false)
+        if (obj instanceof StatisticEntity == false) {
             return false;
-        if (this == obj)
+        }
+        if (this == obj) {
             return true;
+        }
         StatisticEntity other = (StatisticEntity) obj;
         return new EqualsBuilder().append(getId(), other.getId()).isEquals();
     }

house365-hgs-beans/src/main/java/com/house365/beans/entity/StatusSourceStatisticsEntity.java

@@ -2,10 +2,11 @@
  * Description: StatusSourceStatistics数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-11-02 下午 17:54:57
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,98 +14,97 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * StatusSourceStatistics数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-11-02
  * @see
  * @since 1.0
  */
-public class StatusSourceStatisticsEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 统计对象ID
-	 */
-	
-	private Integer projectId;
-	
-	/**
-	 * 统计对象名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String projectName;
-	
-	/**
-	 * 统计对象类型 1 部门 2 职员 3 项目 4状态
-	 */
-	@Length(max=45, message="长度需要大于0且小于45")
-	private String objectType;
-	
-	/**
-	 * 客户状态
-	 */
-	
-	private Integer customerStatus;
-	
-	/**
-	 * 客户数量
-	 */
-	
-	private Integer customerNum;
-	
-	/**
-	 * 来源ID
-	 */
-	
-	private Integer sourceId;
-	
-	/**
-	 * 来源名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String sourceName;
-	
-	/**
-	 * 城市编码
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String city;
-	
-	/**
-	 * 城市名称
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String cityName;
-	
-	/**
-	 * 环比
-	 */
-	
-	private java.math.BigDecimal dayBaseRatio;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	//columns END
-	/*
+public class StatusSourceStatisticsEntity extends DomainObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 统计对象ID
+     */
+
+    private Integer projectId;
+
+    /**
+     * 统计对象名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String projectName;
+
+    /**
+     * 统计对象类型 1 部门 2 职员 3 项目 4状态
+     */
+    @Length(max = 45, message = "长度需要大于0且小于45")
+    private String objectType;
+
+    /**
+     * 客户状态
+     */
+
+    private Integer customerStatus;
+
+    /**
+     * 客户数量
+     */
+
+    private Integer customerNum;
+
+    /**
+     * 来源ID
+     */
+
+    private Integer sourceId;
+
+    /**
+     * 来源名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String sourceName;
+
+    /**
+     * 城市编码
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String city;
+
+    /**
+     * 城市名称
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String cityName;
+
+    /**
+     * 环比
+     */
+
+    private java.math.BigDecimal dayBaseRatio;
+
+    /**
+     * 创建时间
+     */
+
+    private java.util.Date createTime;
+
+    //columns END
+    /*
 	public StatusSourceStatistics(){
 	}
 
@@ -116,239 +116,239 @@ public class StatusSourceStatisticsEntity extends DomainObject{
 
     */
 
-	/**
-	 * 设置统计对象ID
-	 * @param projectId 统计对象ID
-	 */
-	public void setProjectId(Integer projectId) {
-		this.projectId = projectId;
-	}
+    /**
+     * 设置统计对象ID
+     * @param projectId 统计对象ID
+     */
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
 
-	/**
-	 * 获取统计对象ID
-	 * @return 统计对象ID
-	 */
-	public Integer getProjectId() {
-		return this.projectId;
-	}
+    /**
+     * 获取统计对象ID
+     * @return 统计对象ID
+     */
+    public Integer getProjectId() {
+        return this.projectId;
+    }
 
-	/**
-	 * 设置统计对象名称
-	 * @param projectName 统计对象名称
-	 */
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
+    /**
+     * 设置统计对象名称
+     * @param projectName 统计对象名称
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 
-	/**
-	 * 获取统计对象名称
-	 * @return 统计对象名称
-	 */
-	public String getProjectName() {
-		return this.projectName;
-	}
+    /**
+     * 获取统计对象名称
+     * @return 统计对象名称
+     */
+    public String getProjectName() {
+        return this.projectName;
+    }
 
-	/**
-	 * 设置统计对象类型 1 部门 2 职员 3 项目 4状态
-	 * @param objectType 统计对象类型 1 部门 2 职员 3 项目 4状态
-	 */
-	public void setObjectType(String objectType) {
-		this.objectType = objectType;
-	}
+    /**
+     * 设置统计对象类型 1 部门 2 职员 3 项目 4状态
+     * @param objectType 统计对象类型 1 部门 2 职员 3 项目 4状态
+     */
+    public void setObjectType(String objectType) {
+        this.objectType = objectType;
+    }
 
-	/**
-	 * 获取统计对象类型 1 部门 2 职员 3 项目 4状态
-	 * @return 统计对象类型 1 部门 2 职员 3 项目 4状态
-	 */
-	public String getObjectType() {
-		return this.objectType;
-	}
+    /**
+     * 获取统计对象类型 1 部门 2 职员 3 项目 4状态
+     * @return 统计对象类型 1 部门 2 职员 3 项目 4状态
+     */
+    public String getObjectType() {
+        return this.objectType;
+    }
 
-	/**
-	 * 设置客户状态
-	 * @param customerStatus 客户状态
-	 */
-	public void setCustomerStatus(Integer customerStatus) {
-		this.customerStatus = customerStatus;
-	}
+    /**
+     * 设置客户状态
+     * @param customerStatus 客户状态
+     */
+    public void setCustomerStatus(Integer customerStatus) {
+        this.customerStatus = customerStatus;
+    }
 
-	/**
-	 * 获取客户状态
-	 * @return 客户状态
-	 */
-	public Integer getCustomerStatus() {
-		return this.customerStatus;
-	}
+    /**
+     * 获取客户状态
+     * @return 客户状态
+     */
+    public Integer getCustomerStatus() {
+        return this.customerStatus;
+    }
 
-	/**
-	 * 设置客户数量
-	 * @param customerNum 客户数量
-	 */
-	public void setCustomerNum(Integer customerNum) {
-		this.customerNum = customerNum;
-	}
+    /**
+     * 设置客户数量
+     * @param customerNum 客户数量
+     */
+    public void setCustomerNum(Integer customerNum) {
+        this.customerNum = customerNum;
+    }
 
-	/**
-	 * 获取客户数量
-	 * @return 客户数量
-	 */
-	public Integer getCustomerNum() {
-		return this.customerNum;
-	}
+    /**
+     * 获取客户数量
+     * @return 客户数量
+     */
+    public Integer getCustomerNum() {
+        return this.customerNum;
+    }
 
-	/**
-	 * 设置来源ID
-	 * @param sourceId 来源ID
-	 */
-	public void setSourceId(Integer sourceId) {
-		this.sourceId = sourceId;
-	}
+    /**
+     * 设置来源ID
+     * @param sourceId 来源ID
+     */
+    public void setSourceId(Integer sourceId) {
+        this.sourceId = sourceId;
+    }
 
-	/**
-	 * 获取来源ID
-	 * @return 来源ID
-	 */
-	public Integer getSourceId() {
-		return this.sourceId;
-	}
+    /**
+     * 获取来源ID
+     * @return 来源ID
+     */
+    public Integer getSourceId() {
+        return this.sourceId;
+    }
 
-	/**
-	 * 设置来源名称
-	 * @param sourceName 来源名称
-	 */
-	public void setSourceName(String sourceName) {
-		this.sourceName = sourceName;
-	}
+    /**
+     * 设置来源名称
+     * @param sourceName 来源名称
+     */
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
 
-	/**
-	 * 获取来源名称
-	 * @return 来源名称
-	 */
-	public String getSourceName() {
-		return this.sourceName;
-	}
+    /**
+     * 获取来源名称
+     * @return 来源名称
+     */
+    public String getSourceName() {
+        return this.sourceName;
+    }
 
-	/**
-	 * 设置城市编码
-	 * @param city 城市编码
-	 */
-	public void setCity(String city) {
-		this.city = city;
-	}
+    /**
+     * 设置城市编码
+     * @param city 城市编码
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
 
-	/**
-	 * 获取城市编码
-	 * @return 城市编码
-	 */
-	public String getCity() {
-		return this.city;
-	}
+    /**
+     * 获取城市编码
+     * @return 城市编码
+     */
+    public String getCity() {
+        return this.city;
+    }
 
-	/**
-	 * 设置城市名称
-	 * @param cityName 城市名称
-	 */
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
+    /**
+     * 设置城市名称
+     * @param cityName 城市名称
+     */
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
 
-	/**
-	 * 获取城市名称
-	 * @return 城市名称
-	 */
-	public String getCityName() {
-		return this.cityName;
-	}
+    /**
+     * 获取城市名称
+     * @return 城市名称
+     */
+    public String getCityName() {
+        return this.cityName;
+    }
 
-	/**
-	 * 设置环比
-	 * @param dayBaseRatio 环比
-	 */
-	public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
-		this.dayBaseRatio = dayBaseRatio;
-	}
+    /**
+     * 设置环比
+     * @param dayBaseRatio 环比
+     */
+    public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
+        this.dayBaseRatio = dayBaseRatio;
+    }
 
-	/**
-	 * 获取环比
-	 * @return 环比
-	 */
-	public java.math.BigDecimal getDayBaseRatio() {
-		return this.dayBaseRatio;
-	}
+    /**
+     * 获取环比
+     * @return 环比
+     */
+    public java.math.BigDecimal getDayBaseRatio() {
+        return this.dayBaseRatio;
+    }
 
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
+    /**
+     * 设置创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
 
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
+    /**
+     * 设置创建时间字符串格式
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
 
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
+    /**
+     * 获取创建时间
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ProjectId",getProjectId())
-			.append("ProjectName",getProjectName())
-			.append("ObjectType",getObjectType())
-			.append("CustomerStatus",getCustomerStatus())
-			.append("CustomerNum",getCustomerNum())
-			.append("SourceId",getSourceId())
-			.append("SourceName",getSourceName())
-			.append("City",getCity())
-			.append("CityName",getCityName())
-			.append("DayBaseRatio",getDayBaseRatio())
-			.append("CreateTime",getCreateTime())
-			.toString();
-	}
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("ProjectId", getProjectId())
+                .append("ProjectName", getProjectName())
+                .append("ObjectType", getObjectType())
+                .append("CustomerStatus", getCustomerStatus())
+                .append("CustomerNum", getCustomerNum())
+                .append("SourceId", getSourceId())
+                .append("SourceName", getSourceName())
+                .append("City", getCity())
+                .append("CityName", getCityName())
+                .append("DayBaseRatio", getDayBaseRatio())
+                .append("CreateTime", getCreateTime())
+                .toString();
+    }
 
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
 
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof StatusSourceStatisticsEntity == false) return false;
-		if(this == obj) return true;
-		StatusSourceStatisticsEntity other = (StatusSourceStatisticsEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof StatusSourceStatisticsEntity == false) return false;
+        if (this == obj) return true;
+        StatusSourceStatisticsEntity other = (StatusSourceStatisticsEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/UserEvaluateEntity.java

@@ -4,6 +4,11 @@ import com.house365.beans.system.DomainObject;
 
 import java.util.Date;
 
+/**
+ * 用户评分实体类
+ *
+ * @author jay
+ */
 public class UserEvaluateEntity extends DomainObject {
     private static final long serialVersionUID = 1L;
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/UserRoleEntity.java

@@ -2,10 +2,11 @@
  * Description: 角色权限关联数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-09-22 上午 11:32:21
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,202 +14,194 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 角色权限关联数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-09-22
  * @see
  * @since 1.0
  */
-public class UserRoleEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 用户ID
-	 */
-	@NotNull 
-	private Integer userId;
-	
-	/**
-	 * 角色ID
-	 */
-	@NotNull 
-	private Integer roleId;
-	
-	private String roleCode;
-	private String roleName;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	/**
-	 * 创建人用户ID
-	 */
-	
-	private Integer createUserId;
-	
-	//columns END
-	/*
-	public UserRole(){
-	}
-
-	public UserRole(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
-	/**
-	 * 设置用户ID
-	 * @param userId 用户ID
-	 */
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	/**
-	 * 获取用户ID
-	 * @return 用户ID
-	 */
-	public Integer getUserId() {
-		return this.userId;
-	}
-
-	/**
-	 * 设置角色ID
-	 * @param roleId 角色ID
-	 */
-	public void setRoleId(Integer roleId) {
-		this.roleId = roleId;
-	}
-	
-	
-
-	public String getRoleCode() {
-		return roleCode;
-	}
-
-	public void setRoleCode(String roleCode) {
-		this.roleCode = roleCode;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	/**
-	 * 获取角色ID
-	 * @return 角色ID
-	 */
-	public Integer getRoleId() {
-		return this.roleId;
-	}
-
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	/**
-	 * 设置创建人用户ID
-	 * @param createUserId 创建人用户ID
-	 */
-	public void setCreateUserId(Integer createUserId) {
-		this.createUserId = createUserId;
-	}
-
-	/**
-	 * 获取创建人用户ID
-	 * @return 创建人用户ID
-	 */
-	public Integer getCreateUserId() {
-		return this.createUserId;
-	}
+public class UserRoleEntity extends DomainObject {
+
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 用户ID
+     */
+    @NotNull
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    @NotNull
+    private Integer roleId;
+
+    private String roleCode;
+    private String roleName;
+
+    /**
+     * 创建时间
+     */
+    private java.util.Date createTime;
+
+    /**
+     * 创建人用户ID
+     */
+    private Integer createUserId;
+
+    //columns END
+
+
+    /**
+     * 设置用户ID
+     * @param userId 用户ID
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取用户ID
+     * @return 用户ID
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
+
+    /**
+     * 设置角色ID
+     * @param roleId 角色ID
+     */
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+
+    public String getRoleCode() {
+        return roleCode;
+    }
+
+    public void setRoleCode(String roleCode) {
+        this.roleCode = roleCode;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    /**
+     * 获取角色ID
+     * @return 角色ID
+     */
+    public Integer getRoleId() {
+        return this.roleId;
+    }
+
+    /**
+     * 设置创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 设置创建时间字符串格式
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取创建时间
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
+
+    /**
+     * 设置创建人用户ID
+     * @param createUserId 创建人用户ID
+     */
+    public void setCreateUserId(Integer createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取创建人用户ID
+     * @return 创建人用户ID
+     */
+    public Integer getCreateUserId() {
+        return this.createUserId;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("UserId",getUserId())
-			.append("RoleId",getRoleId())
-			.append("CreateTime",getCreateTime())
-			.append("CreateUserId",getCreateUserId())
-			.toString();
-	}
-
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
-
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof UserRoleEntity == false) return false;
-		if(this == obj) return true;
-		UserRoleEntity other = (UserRoleEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("UserId", getUserId())
+                .append("RoleId", getRoleId())
+                .append("CreateTime", getCreateTime())
+                .append("CreateUserId", getCreateUserId())
+                .toString();
+    }
+
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
+
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof UserRoleEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        UserRoleEntity other = (UserRoleEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/UserSourceStatisticsEntity.java

@@ -2,10 +2,11 @@
  * Description: UserSourceStatistics数据库实体/领域对象
  * Copyright:   Copyright (c)2016
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2016-10-25 上午 09:36:01
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,98 +14,96 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
-import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * UserSourceStatistics数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2016-10-25
  * @see
  * @since 1.0
  */
-public class UserSourceStatisticsEntity extends StatisticObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * 统计对象ID
-	 */
-	
-	private Integer projectId;
-	
-	/**
-	 * 统计对象名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String projectName;
-	
-	/**
-	 * 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	@Length(max=45, message="长度需要大于0且小于45")
-	private String objectType;
-	
-	/**
-	 * 客户状态
-	 */
-	
-	private Integer customerStatus;
-	
-	/**
-	 * 客户数量
-	 */
-	
-	private Integer customerNum;
-	
-	/**
-	 * 来源ID
-	 */
-	
-	private Integer sourceId;
-	
-	/**
-	 * 来源名称
-	 */
-	@Length(max=1000, message="长度需要大于0且小于1000")
-	private String sourceName;
-	
-	/**
-	 * 城市编码
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String city;
-	
-	/**
-	 * 城市名称
-	 */
-	@Length(max=20, message="长度需要大于0且小于20")
-	private String cityName;
-	
-	/**
-	 * 环比
-	 */
-	
-	private java.math.BigDecimal dayBaseRatio;
-	
-	/**
-	 * 创建时间
-	 */
-	
-	private java.util.Date createTime;
-	
-	//columns END
-	/*
+public class UserSourceStatisticsEntity extends StatisticObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * 统计对象ID
+     */
+
+    private Integer projectId;
+
+    /**
+     * 统计对象名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String projectName;
+
+    /**
+     * 统计对象类型 1 部门 2 职员 3 项目
+     */
+    @Length(max = 45, message = "长度需要大于0且小于45")
+    private String objectType;
+
+    /**
+     * 客户状态
+     */
+
+    private Integer customerStatus;
+
+    /**
+     * 客户数量
+     */
+
+    private Integer customerNum;
+
+    /**
+     * 来源ID
+     */
+
+    private Integer sourceId;
+
+    /**
+     * 来源名称
+     */
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
+    private String sourceName;
+
+    /**
+     * 城市编码
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String city;
+
+    /**
+     * 城市名称
+     */
+    @Length(max = 20, message = "长度需要大于0且小于20")
+    private String cityName;
+
+    /**
+     * 环比
+     */
+
+    private java.math.BigDecimal dayBaseRatio;
+
+    /**
+     * 创建时间
+     */
+
+    private java.util.Date createTime;
+
+    //columns END
+    /*
 	public UserSourceStatistics(){
 	}
 
@@ -116,239 +115,239 @@ public class UserSourceStatisticsEntity extends StatisticObject{
 
     */
 
-	/**
-	 * 设置统计对象ID
-	 * @param projectId 统计对象ID
-	 */
-	public void setProjectId(Integer projectId) {
-		this.projectId = projectId;
-	}
+    /**
+     * 设置统计对象ID
+     * @param projectId 统计对象ID
+     */
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
 
-	/**
-	 * 获取统计对象ID
-	 * @return 统计对象ID
-	 */
-	public Integer getProjectId() {
-		return this.projectId;
-	}
+    /**
+     * 获取统计对象ID
+     * @return 统计对象ID
+     */
+    public Integer getProjectId() {
+        return this.projectId;
+    }
 
-	/**
-	 * 设置统计对象名称
-	 * @param projectName 统计对象名称
-	 */
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
+    /**
+     * 设置统计对象名称
+     * @param projectName 统计对象名称
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 
-	/**
-	 * 获取统计对象名称
-	 * @return 统计对象名称
-	 */
-	public String getProjectName() {
-		return this.projectName;
-	}
+    /**
+     * 获取统计对象名称
+     * @return 统计对象名称
+     */
+    public String getProjectName() {
+        return this.projectName;
+    }
 
-	/**
-	 * 设置统计对象类型 1 部门 2 职员 3 项目
-	 * @param objectType 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	public void setObjectType(String objectType) {
-		this.objectType = objectType;
-	}
+    /**
+     * 设置统计对象类型 1 部门 2 职员 3 项目
+     * @param objectType 统计对象类型 1 部门 2 职员 3 项目
+     */
+    public void setObjectType(String objectType) {
+        this.objectType = objectType;
+    }
 
-	/**
-	 * 获取统计对象类型 1 部门 2 职员 3 项目
-	 * @return 统计对象类型 1 部门 2 职员 3 项目
-	 */
-	public String getObjectType() {
-		return this.objectType;
-	}
+    /**
+     * 获取统计对象类型 1 部门 2 职员 3 项目
+     * @return 统计对象类型 1 部门 2 职员 3 项目
+     */
+    public String getObjectType() {
+        return this.objectType;
+    }
 
-	/**
-	 * 设置客户状态
-	 * @param customerStatus 客户状态
-	 */
-	public void setCustomerStatus(Integer customerStatus) {
-		this.customerStatus = customerStatus;
-	}
+    /**
+     * 设置客户状态
+     * @param customerStatus 客户状态
+     */
+    public void setCustomerStatus(Integer customerStatus) {
+        this.customerStatus = customerStatus;
+    }
 
-	/**
-	 * 获取客户状态
-	 * @return 客户状态
-	 */
-	public Integer getCustomerStatus() {
-		return this.customerStatus;
-	}
+    /**
+     * 获取客户状态
+     * @return 客户状态
+     */
+    public Integer getCustomerStatus() {
+        return this.customerStatus;
+    }
 
-	/**
-	 * 设置客户数量
-	 * @param customerNum 客户数量
-	 */
-	public void setCustomerNum(Integer customerNum) {
-		this.customerNum = customerNum;
-	}
+    /**
+     * 设置客户数量
+     * @param customerNum 客户数量
+     */
+    public void setCustomerNum(Integer customerNum) {
+        this.customerNum = customerNum;
+    }
 
-	/**
-	 * 获取客户数量
-	 * @return 客户数量
-	 */
-	public Integer getCustomerNum() {
-		return this.customerNum;
-	}
+    /**
+     * 获取客户数量
+     * @return 客户数量
+     */
+    public Integer getCustomerNum() {
+        return this.customerNum;
+    }
 
-	/**
-	 * 设置来源ID
-	 * @param sourceId 来源ID
-	 */
-	public void setSourceId(Integer sourceId) {
-		this.sourceId = sourceId;
-	}
+    /**
+     * 设置来源ID
+     * @param sourceId 来源ID
+     */
+    public void setSourceId(Integer sourceId) {
+        this.sourceId = sourceId;
+    }
 
-	/**
-	 * 获取来源ID
-	 * @return 来源ID
-	 */
-	public Integer getSourceId() {
-		return this.sourceId;
-	}
+    /**
+     * 获取来源ID
+     * @return 来源ID
+     */
+    public Integer getSourceId() {
+        return this.sourceId;
+    }
 
-	/**
-	 * 设置来源名称
-	 * @param sourceName 来源名称
-	 */
-	public void setSourceName(String sourceName) {
-		this.sourceName = sourceName;
-	}
+    /**
+     * 设置来源名称
+     * @param sourceName 来源名称
+     */
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
 
-	/**
-	 * 获取来源名称
-	 * @return 来源名称
-	 */
-	public String getSourceName() {
-		return this.sourceName;
-	}
+    /**
+     * 获取来源名称
+     * @return 来源名称
+     */
+    public String getSourceName() {
+        return this.sourceName;
+    }
 
-	/**
-	 * 设置城市编码
-	 * @param city 城市编码
-	 */
-	public void setCity(String city) {
-		this.city = city;
-	}
+    /**
+     * 设置城市编码
+     * @param city 城市编码
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
 
-	/**
-	 * 获取城市编码
-	 * @return 城市编码
-	 */
-	public String getCity() {
-		return this.city;
-	}
+    /**
+     * 获取城市编码
+     * @return 城市编码
+     */
+    public String getCity() {
+        return this.city;
+    }
 
-	/**
-	 * 设置城市名称
-	 * @param cityName 城市名称
-	 */
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
+    /**
+     * 设置城市名称
+     * @param cityName 城市名称
+     */
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
 
-	/**
-	 * 获取城市名称
-	 * @return 城市名称
-	 */
-	public String getCityName() {
-		return this.cityName;
-	}
+    /**
+     * 获取城市名称
+     * @return 城市名称
+     */
+    public String getCityName() {
+        return this.cityName;
+    }
 
-	/**
-	 * 设置环比
-	 * @param dayBaseRatio 环比
-	 */
-	public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
-		this.dayBaseRatio = dayBaseRatio;
-	}
+    /**
+     * 设置环比
+     * @param dayBaseRatio 环比
+     */
+    public void setDayBaseRatio(java.math.BigDecimal dayBaseRatio) {
+        this.dayBaseRatio = dayBaseRatio;
+    }
 
-	/**
-	 * 获取环比
-	 * @return 环比
-	 */
-	public java.math.BigDecimal getDayBaseRatio() {
-		return this.dayBaseRatio;
-	}
+    /**
+     * 获取环比
+     * @return 环比
+     */
+    public java.math.BigDecimal getDayBaseRatio() {
+        return this.dayBaseRatio;
+    }
 
-	/**
-	 * 设置创建时间
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
+    /**
+     * 设置创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
 
-	/**
-	 * 设置创建时间字符串格式
-	 * @param createTime 创建时间
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
+    /**
+     * 设置创建时间字符串格式
+     * @param createTime 创建时间
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
 
-	/**
-	 * 获取创建时间
-	 * @return 创建时间
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
+    /**
+     * 获取创建时间
+     * @return 创建时间
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ProjectId",getProjectId())
-			.append("ProjectName",getProjectName())
-			.append("ObjectType",getObjectType())
-			.append("CustomerStatus",getCustomerStatus())
-			.append("CustomerNum",getCustomerNum())
-			.append("SourceId",getSourceId())
-			.append("SourceName",getSourceName())
-			.append("City",getCity())
-			.append("CityName",getCityName())
-			.append("DayBaseRatio",getDayBaseRatio())
-			.append("CreateTime",getCreateTime())
-			.toString();
-	}
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("ProjectId", getProjectId())
+                .append("ProjectName", getProjectName())
+                .append("ObjectType", getObjectType())
+                .append("CustomerStatus", getCustomerStatus())
+                .append("CustomerNum", getCustomerNum())
+                .append("SourceId", getSourceId())
+                .append("SourceName", getSourceName())
+                .append("City", getCity())
+                .append("CityName", getCityName())
+                .append("DayBaseRatio", getDayBaseRatio())
+                .append("CreateTime", getCreateTime())
+                .toString();
+    }
 
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
 
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof UserSourceStatisticsEntity == false) return false;
-		if(this == obj) return true;
-		UserSourceStatisticsEntity other = (UserSourceStatisticsEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof UserSourceStatisticsEntity == false) return false;
+        if (this == obj) return true;
+        UserSourceStatisticsEntity other = (UserSourceStatisticsEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/UserStarEntity.java

@@ -2,10 +2,11 @@
  * Description: UserStar数据库实体/领域对象
  * Copyright:   Copyright (c)2017
  * Company:     江苏三六五网络股份有限公司
- * @author:     江苏三六五网络股份有限公司
- * @version:    1.0
+ *
+ * @author: 江苏三六五网络股份有限公司
+ * @version: 1.0
  * Create at:   2017-05-15 下午 17:04:55
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,56 +14,56 @@
  */
 package com.house365.beans.entity;
 
-import javax.validation.constraints.*;
 import com.house365.beans.system.DomainObject;
-import org.hibernate.validator.constraints.*;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * UserStar数据库实体/领域对象<br>
- * 
+ *
  * @author 江苏三六五网络股份有限公司
  * @version 1.0, 2017-05-15
  * @see
  * @since 1.0
  */
-public class UserStarEntity extends DomainObject{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	//可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
-	//columns START
-	/**
-	 * userId
-	 */
-	@NotNull 
-	private Integer userId;
-	
-	/**
-	 * starUserId
-	 */
-	@NotNull 
-	private Integer starUserId;
-	
-	/**
-	 * 1 y - 0 n
-	 */
-	@NotNull 
-	private Integer star;
-	
-	/**
-	 * createTime
-	 */
-	@NotNull 
-	private java.util.Date createTime;
-	
-	//columns END
-	/*
+public class UserStarEntity extends DomainObject {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
+    //columns START
+    /**
+     * userId
+     */
+    @NotNull
+    private Integer userId;
+
+    /**
+     * starUserId
+     */
+    @NotNull
+    private Integer starUserId;
+
+    /**
+     * 1 y - 0 n
+     */
+    @NotNull
+    private Integer star;
+
+    /**
+     * createTime
+     */
+    @NotNull
+    private java.util.Date createTime;
+
+    //columns END
+    /*
 	public UserStar(){
 	}
 
@@ -74,120 +75,120 @@ public class UserStarEntity extends DomainObject{
 
     */
 
-	/**
-	 * 设置userId
-	 * @param userId userId
-	 */
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
+    /**
+     * 设置userId
+     * @param userId userId
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
 
-	/**
-	 * 获取userId
-	 * @return userId
-	 */
-	public Integer getUserId() {
-		return this.userId;
-	}
+    /**
+     * 获取userId
+     * @return userId
+     */
+    public Integer getUserId() {
+        return this.userId;
+    }
 
-	/**
-	 * 设置starUserId
-	 * @param starUserId starUserId
-	 */
-	public void setStarUserId(Integer starUserId) {
-		this.starUserId = starUserId;
-	}
+    /**
+     * 设置starUserId
+     * @param starUserId starUserId
+     */
+    public void setStarUserId(Integer starUserId) {
+        this.starUserId = starUserId;
+    }
 
-	/**
-	 * 获取starUserId
-	 * @return starUserId
-	 */
-	public Integer getStarUserId() {
-		return this.starUserId;
-	}
+    /**
+     * 获取starUserId
+     * @return starUserId
+     */
+    public Integer getStarUserId() {
+        return this.starUserId;
+    }
 
-	/**
-	 * 设置1 y - 0 n
-	 * @param star 1 y - 0 n
-	 */
-	public void setStar(Integer star) {
-		this.star = star;
-	}
+    /**
+     * 设置1 y - 0 n
+     * @param star 1 y - 0 n
+     */
+    public void setStar(Integer star) {
+        this.star = star;
+    }
 
-	/**
-	 * 获取1 y - 0 n
-	 * @return 1 y - 0 n
-	 */
-	public Integer getStar() {
-		return this.star;
-	}
+    /**
+     * 获取1 y - 0 n
+     * @return 1 y - 0 n
+     */
+    public Integer getStar() {
+        return this.star;
+    }
 
-	/**
-	 * 设置createTime
-	 * @param createTime createTime
-	 */
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
+    /**
+     * 设置createTime
+     * @param createTime createTime
+     */
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
 
-	/**
-	 * 设置createTime字符串格式
-	 * @param createTime createTime
-	 */
-	public void setCreateTimeStr(String createTime) {
-		if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
-			try {
-				this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
-			} catch (java.text.ParseException ex) {
-				ex.printStackTrace();
-			}
-		}
-	}
+    /**
+     * 设置createTime字符串格式
+     * @param createTime createTime
+     */
+    public void setCreateTimeStr(String createTime) {
+        if (!com.house365.web.util.StringUtils.isBlank(createTime)) {
+            try {
+                this.createTime = java.text.DateFormat.getDateTimeInstance().parse(createTime);
+            } catch (java.text.ParseException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
 
-	/**
-	 * 获取createTime
-	 * @return createTime
-	 */
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
+    /**
+     * 获取createTime
+     * @return createTime
+     */
+    public java.util.Date getCreateTime() {
+        return this.createTime;
+    }
 
     /**
      * 实体的toString方法
      * @return 实体字符串
      */
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("UserId",getUserId())
-			.append("StarUserId",getStarUserId())
-			.append("Star",getStar())
-			.append("CreateTime",getCreateTime())
-			.toString();
-	}
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("Id", getId())
+                .append("UserId", getUserId())
+                .append("StarUserId", getStarUserId())
+                .append("Star", getStar())
+                .append("CreateTime", getCreateTime())
+                .toString();
+    }
 
-	/**
-	 * 获取hash码
-	 * @return HASH码
-	 */
-	public int hashCode() {
-		return new HashCodeBuilder()
-			.append(getId())
-			.toHashCode();
-	}
+    /**
+     * 获取hash码
+     * @return HASH码
+     */
+    public int hashCode() {
+        return new HashCodeBuilder()
+                .append(getId())
+                .toHashCode();
+    }
 
-	/**
-	 * 对象比较
-	 * @param obj 待比较对象
-	 * @return 是否相同<li>true--相同<li>false--不相同
-	 */
-	public boolean equals(Object obj) {
-		if(obj instanceof UserStarEntity == false) return false;
-		if(this == obj) return true;
-		UserStarEntity other = (UserStarEntity)obj;
-		return new EqualsBuilder()
-			.append(getId(),other.getId())
-			.isEquals();
-	}
+    /**
+     * 对象比较
+     * @param obj 待比较对象
+     * @return 是否相同<li>true--相同<li>false--不相同
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof UserStarEntity == false) return false;
+        if (this == obj) return true;
+        UserStarEntity other = (UserStarEntity) obj;
+        return new EqualsBuilder()
+                .append(getId(), other.getId())
+                .isEquals();
+    }
 }
 

house365-hgs-beans/src/main/java/com/house365/beans/entity/UserWxRelation.java

@@ -5,6 +5,8 @@ import com.house365.beans.system.DomainObject;
 import java.util.Date;
 
 /**
+ * 用户微信关系实体类
+ *
  * @author Created by Administrator on 2020/3/17.
  */
 public class UserWxRelation extends DomainObject {

house365-hgs-beans/src/main/java/com/house365/beans/entity/WxUserEntity.java

@@ -3,8 +3,9 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 /**
- * @author
- * Created by Administrator on 2020/3/17.
+ * 企业微信用户实体类
+ *
+ * @author Created by Administrator on 2020/3/17.
  */
 public class WxUserEntity extends DomainObject {
 

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerManagementController.java

@@ -494,11 +494,9 @@ public class CustomerManagementController extends BaseController {
                 ("GTE_customTimeStart"))) || !Strings.isNullOrEmpty(String.valueOf(searchParams.get
                 ("LTE_customTimeEnd")))) {
             if ("1".equals(customTimeType)) {
-
                 // 回访时间
                 searchParams.put("EQ_customTimeTypeOne", "1");
             } else if ("2".equals(customTimeType)) {
-
                 // 约看时间
                 searchParams.put("EQ_customTimeTypeTwo", "1");
             } else if ("3".equals(customTimeType)) {
@@ -506,15 +504,12 @@ public class CustomerManagementController extends BaseController {
                 // 到访时间
                 searchParams.put("EQ_customTimeTypeThree", "1");
             } else if ("4".equals(customTimeType)) {
-
                 // 认筹时间
                 searchParams.put("EQ_customTimeTypeFour", "1");
             } else if ("5".equals(customTimeType)) {
-
                 // 认购时间
                 searchParams.put("EQ_customTimeTypeFive", "1");
             } else if ("6".equals(customTimeType)) {
-
                 // 签约时间
                 searchParams.put("EQ_customTimeTypeSix", "1");
             }
@@ -754,8 +749,7 @@ public class CustomerManagementController extends BaseController {
 
                     // 获取star
                     star = customerEntity.getStarCustomer() == 1 ? "on" : "off";
-                    userId4Star = customerId2UsrIdMap.get(customerEntity.getId()) == null ? "" : customerId2UsrIdMap.get
-                            (customerEntity.getId());
+                    userId4Star = customerId2UsrIdMap.get(customerEntity.getId()) == null ? "" : customerId2UsrIdMap.get(customerEntity.getId());
                 } else {
                     // 计算倒计时
                     Date bindTime = customerEntity.getBindTime();

house365-hgs-web/src/main/java/com/house365/web/controller/PlatformManagementController.java

@@ -64,8 +64,7 @@ public class PlatformManagementController extends BaseController {
             page.setCurrentPage(number);
         }
         UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY);
-        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(
-                SessionConstants.SESSION_CURRNET_DEPT_KEY);
+        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(SessionConstants.SESSION_CURRNET_DEPT_KEY);
         String cityId = departmentEntity.getCityID();
         DepartmentResponse departmentResponse = department.getDepartmentById(Integer.valueOf(cityId));
         String cityCode = departmentResponse.getEntity().getDescripition();
@@ -252,7 +251,7 @@ public class PlatformManagementController extends BaseController {
                 searchMap.put("ids", ids);
                 searchMap.put("managerId", userEntity.getId());
                 searchMap.put("cityCode", cityCode);
-                if(CollectionUtils.isNotEmpty(ids)){
+                if (CollectionUtils.isNotEmpty(ids)) {
                     callbackList = customer.getCallBackList(searchMap);
                 }
 
@@ -429,23 +428,21 @@ public class PlatformManagementController extends BaseController {
         List<PlatRuleEntity> deptList = platRule.queryDeptList(userEntity.getId());
         if (deptList == null || deptList.size() == 0) {
             csMap.put("deptUrlPath", city.getUrlPath());
-//        csMap.put("identityType", "1");//当前城市安家顾问
-            csMap.put("position", "直销主管");//
+            csMap.put("position", "直销主管");
             managers = iuser.queryManagers(csMap);
         } else {
-            String deptIds = "";
             List<Integer> idList = new ArrayList<>();
             for (PlatRuleEntity pre : deptList) {
                 idList.add(Integer.valueOf(pre.getSalesGroupIds()));
             }
-//            deptIds = deptIds.substring(0, deptIds.length()-1);
             csMap.put("deptIds", idList);
             managers = iuser.queryRuleManagers(csMap);
         }
 
 
         model.addAttribute("managers", managers);
-        model.addAttribute("sources", cslrs.getObjectList());//活动来源
+        //活动来源
+        model.addAttribute("sources", cslrs.getObjectList());
         model.addAttribute("entity", vo.getEntity());
         return getAutoUrl("newCustomer");
     }
@@ -583,7 +580,7 @@ public class PlatformManagementController extends BaseController {
             CustomerResponse customerResponse = customer.getCustomerById(Integer.valueOf(customerId));
             customerEntity = customerResponse.getEntity();
         } else {
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>(10);
             map.put("managerId", managerId);
             map.put("phone", phone);
             customerEntity = customer.getMergeCustomerId(map);
@@ -686,7 +683,7 @@ public class PlatformManagementController extends BaseController {
     }
 
 
-    public List<CustomerProjectEntity> doCustomerProject(UserEntity userEntity, List<Integer> customerIdList) {
+    private List<CustomerProjectEntity> doCustomerProject(UserEntity userEntity, List<Integer> customerIdList) {
         Map<String, Object> cpMap = new HashMap<>(10);
         cpMap.put("idList", customerIdList);
         List<CustomerProjectEntity> cpList = customerProject.queryList(cpMap);
@@ -706,7 +703,7 @@ public class PlatformManagementController extends BaseController {
         return cpList;
     }
 
-    public List<CustomerProjectEntity> doCustomerProject(UserEntity userEntity, CustomerEntity customerEntity) {
+    private List<CustomerProjectEntity> doCustomerProject(UserEntity userEntity, CustomerEntity customerEntity) {
         Map<String, Object> cpMap = new HashMap<>(10);
         cpMap.put("customerIdNew", customerEntity.getId());
         List<CustomerProjectEntity> cpList = customerProject.queryList(cpMap);
@@ -726,78 +723,6 @@ public class PlatformManagementController extends BaseController {
         return cpList;
     }
 
-    public List<String> addOperateLog(List<String> logShowList, List<CustomerLogEntity> list) {
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (CustomerLogEntity p : list) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                //获取String类型的时间
-                String showTime = sdf.format(p.getCreateTime());
-                if (p.getType() == 1) {
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [新增客户]";
-                    logShowList.add(showWord);
-                } else if (p.getType() == 2) {
-                    StringBuilder builder = new StringBuilder();
-                    builder.append(showTime).append("   ").append(p.getCreateUserName()).append("  [编辑客户]  ");
-                    builder.append("将  '").append(p.getModifyName()).append("'  由  '").append(p.getOldValue())
-                            .append("'  修改为  '").append(p.getNewValue()).append("' , ");
-                    logShowList.add(builder.toString().substring(0, builder.toString().lastIndexOf(",")));
-                } else if (p.getType() == 3) {
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [删除客户]";
-                    logShowList.add(showWord);
-                } else if (p.getType() == 4) {
-                    //营销活动派工
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [营销活动-派工客户]" + "给  ";
-                    if (StringUtils.isNotBlank(p.getNewValue())) {
-                        UserEntity showUser = iuser.getById(Integer.valueOf(p.getNewValue()));
-                        if (null != showUser) {
-                            showWord = showWord + showUser.getRealName();
-                        }
-                    }
-                    logShowList.add(showWord);
-                } else if (p.getType() == 5) {
-                    //公海派工
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [公海-派工客户]" + "给  ";
-                    if (StringUtils.isNotBlank(p.getNewValue())) {
-                        UserEntity showUser = iuser.getById(Integer.valueOf(p.getNewValue()));
-                        if (null != showUser) {
-                            showWord = showWord + showUser.getRealName();
-                        }
-                    }
-                    logShowList.add(showWord);
-                } else if (p.getType() == 6) {
-                    //移入派工
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [移入公海]";
-                    logShowList.add(showWord);
-                } else if (p.getType() == 7) {
-                    //转移客户
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [转移客户]" + "给  ";
-                    if (StringUtils.isNotBlank(p.getNewValue())) {
-                        UserEntity showUser = iuser.getById(Integer.valueOf(p.getNewValue()));
-                        if (null != showUser) {
-                            showWord = showWord + showUser.getRealName();
-                        }
-                    }
-                    logShowList.add(showWord);
-                } else if (p.getType() == 8) {
-                    //无变动
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [无变动]";
-                    logShowList.add(showWord);
-                } else if (p.getType() == 9) {
-                    //云迹活动派工
-                    String showWord = showTime + "  " + p.getCreateUserName() + " [云迹活动-派工客户]" + " 给 ";
-                    UserEntity showUser = iuser.getById(Integer.valueOf(p.getNewValue()));
-                    if (null != showUser) {
-                        showWord = showWord + showUser.getRealName();
-                    }
-                    logShowList.add(showWord);
-                }
-
-            }
-        }
-        return logShowList;
-    }
-
-
     /**
      * 平台客户规则
      *
@@ -814,9 +739,7 @@ public class PlatformManagementController extends BaseController {
         if (null != number) {
             page.setCurrentPage(number);
         }
-        UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY);
-        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(
-                SessionConstants.SESSION_CURRNET_DEPT_KEY);
+        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(SessionConstants.SESSION_CURRNET_DEPT_KEY);
         String cityId = departmentEntity.getCityID();
         DepartmentResponse departmentResponse = department.getDepartmentById(Integer.valueOf(cityId));
         String cityCode = departmentResponse.getEntity().getDescripition();
@@ -887,17 +810,6 @@ public class PlatformManagementController extends BaseController {
         DepartmentListResponse resp = department.getDepartmentList(listReq);
         List<DepartmentEntity> models = resp.getObjectList();
         model.addAttribute("trees", models);
-//        DepartmentEntity departmentEntity = (DepartmentEntity) request.getSession().getAttribute(
-//                SessionConstants.SESSION_CURRNET_DEPT_KEY);
-//        String cityId = departmentEntity.getCityID();
-//        DepartmentResponse departmentResponse = department.getDepartmentById(Integer.valueOf(cityId));
-//        DepartmentEntity city = departmentResponse.getEntity();
-//
-//        Map<String, Object> csMap = new HashMap<>(10);
-//        csMap.put("EQ_city", city.getDescripition());
-//
-////        List<CustomerSourceEntity> list = customerSource.queryByConditions(map);
-////        model.addAttribute("sources", list);
         return getAutoUrl("addRule");
     }
 
@@ -956,19 +868,18 @@ public class PlatformManagementController extends BaseController {
     @RequestMapping(value = "modifyRule", method = RequestMethod.GET)
     @ResponseBody
     public String modifyRule(Model model, HttpServletRequest request) {
-//        UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY);
         String ruleId = request.getParameter("ruleId");
         String platDeptId = request.getParameter("platDeptId");
         String saleDeptId = request.getParameter("saleDeptId");
         String platDeptName = request.getParameter("platDeptName");
         String saleDeptName = request.getParameter("saleDeptName");
-        Date newdate = new Date();
+        Date newDate = new Date();
         PlatRuleEntity pre = new PlatRuleEntity();
         pre.setPlatGroupIds(platDeptId);
         pre.setPlatGroupName(platDeptName);
         pre.setSalesGroupIds(saleDeptId);
         pre.setSalesGroupName(saleDeptName);
-        pre.setUpdateTime(newdate);
+        pre.setUpdateTime(newDate);
         pre.setId(Integer.valueOf(ruleId));
         platRule.modifyRule(pre);
         return "success";
@@ -997,7 +908,7 @@ public class PlatformManagementController extends BaseController {
         String saleDeptId = request.getParameter("saleDeptId");
         String platDeptName = request.getParameter("platDeptName");
         String saleDeptName = request.getParameter("saleDeptName");
-        Date newdate = new Date();
+        Date newDate = new Date();
         PlatRuleEntity pre = new PlatRuleEntity();
         pre.setCreaterId(String.valueOf(userEntity.getId()));
         pre.setCreaterName(userEntity.getRealName());
@@ -1005,12 +916,10 @@ public class PlatformManagementController extends BaseController {
         pre.setPlatGroupName(platDeptName);
         pre.setSalesGroupIds(saleDeptId);
         pre.setSalesGroupName(saleDeptName);
-        pre.setCreateTime(newdate);
-        pre.setUpdateTime(newdate);
+        pre.setCreateTime(newDate);
+        pre.setUpdateTime(newDate);
         pre.setCityCode(city.getDescripition());
         platRule.saveRule(pre);
-
-
         return "success";
     }
 

house365-hgs-web/src/main/java/com/house365/web/controller/UserController.java

@@ -319,7 +319,7 @@ public class UserController extends BaseController {
                                 saveUnbindLog(userEntity, delUser);
                             }
                         }
-                        user.deleteUserById(Integer.valueOf(ids[i]));
+                        user.deleteUserById(Integer.valueOf(ids[i]),userEntity.getId());
                     }
                 }
             } else {
@@ -334,7 +334,7 @@ public class UserController extends BaseController {
                             saveUnbindLog(userEntity, delUser);
                         }
                     }
-                    user.deleteUserById(Integer.valueOf(id));
+                    user.deleteUserById(Integer.valueOf(id),userEntity.getId());
                 }
             }
         }

house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/list.jsp

@@ -256,8 +256,10 @@
                 </td>
                     <%-- <shiro:hasPermission name="USER_EDIT">  --%>
                 <td nowrap="nowrap">
+                        <%--<i class="icon-edit pointer icon-large" title="编辑"--%>
+                        <%--onclick="window.location='${ctx}/user/${user.entity.id}?action=edit'"></i>--%>
                     <i class="icon-edit pointer icon-large" title="编辑"
-                       onclick="window.location='${ctx}/user/${user.entity.id}?action=edit'"></i>
+                       onclick="goEdit(${user.entity.id})"></i>
                     &nbsp;&nbsp;
                     <i title="删除"
                        class="icon-minus pointer icon-large"
@@ -311,9 +313,6 @@
                 <li class="choosemask-fbs" onclick="saveIM(1)" style="margin-left: 10px;">安家顾问</li>
                 <li class="choosemask-fbs" onclick="saveIM(20)" style="margin-left: 10px;">平台人员</li>
             </ul>
-            <%--<ul class="choosemask-twobtn clearfix">--%>
-                <%--<li class="choosemask-fbs" onclick="saveIM(13)">房博士测试</li>--%>
-            <%--</ul>--%>
         </div>
     </div>
 </div>
@@ -354,6 +353,11 @@
     }
 
     function lock(obj) {
+        debugger;
+        if (obj == 257) {
+            alert("appstore账户，请勿操作");
+            return;
+        }
         $.ajax({
             url: '${ctx}/user/lock/' + obj,
             type: "GET",
@@ -372,6 +376,18 @@
         });
     }
 
+    function goEdit(id) {
+        debugger;
+        if (id == 257) {
+            alert("appstore账户，请勿操作");
+            return;
+        }
+        var url = "/house365-hgs-web/user/" + id + "?action=edit";
+        window.location = url;
+//        window.location.href = url;
+        <%--window.location='${ctx}/user/ + "" id + "" + ?action=edit';--%>
+    }
+
     //全选
     function checkAll(btn) {
         if (btn.checked) {
@@ -436,13 +452,17 @@
         if (selectedId == "") {
             House365Util.createModal("删除员工", "请至少选择一条员工!", function () {
             });
-        }
-        else {
+        } else {
             if (hasCustomers || localHasCustomers) {
                 House365Util.createModal("删除员工", "员工名下还有客户，请转移交接给其他置业顾问后再删除。", function () {
                 });
             } else {
                 House365Util.createModal("删除员工", "删除后将无法恢复员工账号，请确认是否继续？", function () {
+                    debugger;
+                    if (selectedId.includes("257")  == true) {
+                        alert("appstore账户，请勿操作");
+                        return;
+                    }
                     $.ajax({
                         url: '${ctx}/user/' + selectedId,
                         type: "DELETE",

house365-hgs-ws-interfaces/src/main/java/com/house365/ws/interfaces/server/IUser.java

@@ -106,7 +106,7 @@ public interface IUser extends IService {
      * @param id 唯一标识
      * @return 删除账户响应
      */
-    UserResponse deleteUserById(Integer id);
+    UserResponse deleteUserById(Integer id,int userId);
 
     /**
      * 修改账户

house365-hgs-ws/src/main/java/com/house365/ws/dao/mapper/CityConfigMapper.java

 package com.house365.ws.dao.mapper;
 
 import com.house365.beans.entity.CityCallConfig;
-import com.house365.beans.entity.ApproximateEntity;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Created by Administrator on 2019/5/6.

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/UserImpl.java

@@ -450,7 +450,7 @@ public class UserImpl implements IUser {
      * @return 删除账户响应
      */
     @Override
-    public UserResponse deleteUserById(Integer id) {
+    public UserResponse deleteUserById(Integer id,int userId) {
         UserResponse response = new UserResponse();
         try {
             // 插入delete_user表
@@ -462,6 +462,8 @@ public class UserImpl implements IUser {
             ConvertUtils.register(new DoubleConverter(null), Double.class);
             ConvertUtils.register(new DateConverter(null), Date.class);
             BeanUtils.copyProperties(userDeleted, user);
+            //添加删除日志
+            userDeleted.setCreateUserid(userId);
             userDeletedService.save(userDeleted);
 
             // 从user表删除用户
@@ -823,7 +825,7 @@ public class UserImpl implements IUser {
         return result;
     }
 
-    public final static String MD5(String s) {
+    private final static String MD5(String s) {
         char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                 'a', 'b', 'c', 'd', 'e', 'f'};
         try {

house365-hgs-ws/src/main/java/com/house365/ws/service/interfaces/IGetAppUrlService.java

 package com.house365.ws.service.interfaces;
 
 import com.house365.beans.entity.AppUrl;
-import com.house365.beans.system.QueryParams;
 import com.house365.service.system.Interfaces.Service;
 
 import java.util.List;
 
 /**
- * Created by Administrator on 2018/9/13.
+ * @author Created by Administrator on 2018/9/13.
  */
-public interface IGetAppUrlService <T extends AppUrl> extends Service<T> {
+public interface IGetAppUrlService<T extends AppUrl> extends Service<T> {
 
     List<AppUrl> getListByType(Integer type);
 }