实体类添加注释

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/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
  * ------------------------------------------------------------------
@@ -29,9 +30,7 @@ import org.hibernate.validator.constraints.Length;
  * @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,6 +453,7 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取城市
+     *
      * @return 城市
      */
     public String getCity() {
@@ -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,8 +517,10 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 获取hash码
+     *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -545,15 +529,21 @@ public class EvaluateUserCustomerLogEntity extends DomainObject {
 
     /**
      * 对象比较
+     *
      * @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;
+        if (obj instanceof EvaluateUserCustomerLogEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        EvaluateUserCustomerLogEntity other = (EvaluateUserCustomerLogEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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
  * Create at:   2017-12-18 下午 15:44:53
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,13 +14,12 @@
  */
 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>
@@ -29,7 +29,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class HouseInfoEntity extends DomainObject{
+public class HouseInfoEntity extends DomainObject {
     /**
      *
      */
@@ -46,25 +46,24 @@ public class HouseInfoEntity extends DomainObject{
     /**
      * 楼盘名称
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String houseName;
 
     /**
      * 楼盘联系电话
      */
-	@Length(max=200, message="长度需要大于0且小于200")
+    @Length(max = 200, message = "长度需要大于0且小于200")
     private String housePhone;
 
     /**
      * 城市编号
      */
-	
     private Integer cityId;
 
     /**
      * 城市名称
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String cityName;
 
     /**
@@ -76,30 +75,18 @@ public class HouseInfoEntity extends DomainObject{
     /**
      * 物业类型 1住宅2写字楼3别墅4商业5公寓
      */
-	
     private Integer channel;
 
     /**
      * cityKey
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @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) {
@@ -108,6 +95,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取楼盘编号
+     *
      * @return 楼盘编号
      */
     public Integer getHouseId() {
@@ -116,6 +104,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置楼盘名称
+     *
      * @param houseName 楼盘名称
      */
     public void setHouseName(String houseName) {
@@ -124,6 +113,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取楼盘名称
+     *
      * @return 楼盘名称
      */
     public String getHouseName() {
@@ -132,6 +122,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置楼盘联系电话
+     *
      * @param housePhone 楼盘联系电话
      */
     public void setHousePhone(String housePhone) {
@@ -140,6 +131,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取楼盘联系电话
+     *
      * @return 楼盘联系电话
      */
     public String getHousePhone() {
@@ -148,6 +140,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置城市编号
+     *
      * @param cityId 城市编号
      */
     public void setCityId(Integer cityId) {
@@ -156,6 +149,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取城市编号
+     *
      * @return 城市编号
      */
     public Integer getCityId() {
@@ -164,6 +158,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置城市名称
+     *
      * @param cityName 城市名称
      */
     public void setCityName(String cityName) {
@@ -172,6 +167,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取城市名称
+     *
      * @return 城市名称
      */
     public String getCityName() {
@@ -180,6 +176,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置是否删除 0:未删除 1:已删除
+     *
      * @param isDeleted 是否删除 0:未删除 1:已删除
      */
     public void setIsDeleted(Integer isDeleted) {
@@ -188,6 +185,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取是否删除 0:未删除 1:已删除
+     *
      * @return 是否删除 0:未删除 1:已删除
      */
     public Integer getIsDeleted() {
@@ -196,6 +194,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置物业类型 1住宅2写字楼3别墅4商业5公寓
+     *
      * @param channel 物业类型 1住宅2写字楼3别墅4商业5公寓
      */
     public void setChannel(Integer channel) {
@@ -204,6 +203,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取物业类型 1住宅2写字楼3别墅4商业5公寓
+     *
      * @return 物业类型 1住宅2写字楼3别墅4商业5公寓
      */
     public Integer getChannel() {
@@ -212,6 +212,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 设置cityKey
+     *
      * @param cityKey cityKey
      */
     public void setCityKey(String cityKey) {
@@ -220,6 +221,7 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 获取cityKey
+     *
      * @return cityKey
      */
     public String getCityKey() {
@@ -228,26 +230,30 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
+    @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())
+                .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())
@@ -256,15 +262,21 @@ public class HouseInfoEntity extends DomainObject{
 
     /**
      * 对象比较
+     *
      * @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;
+        if (obj instanceof HouseInfoEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        HouseInfoEntity other = (HouseInfoEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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,6 +474,7 @@ 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(
@@ -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
  * 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;
@@ -29,7 +28,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class MarketBuildingRelEntity extends DomainObject{
+public class MarketBuildingRelEntity extends DomainObject {
     /**
      *
      */
@@ -48,21 +47,9 @@ public class MarketBuildingRelEntity extends DomainObject{
      */
     private Integer activeId;
 
-	//columns END
-	/*
-	public MarketBuildingRel(){
-	}
-
-	public MarketBuildingRel(
-		Integer id
-	){
-		this.id = id;
-	}
-
-    */
-
     /**
      * 设置楼盘ID
+     *
      * @param buildingId 楼盘ID
      */
     public void setBuildingId(Integer buildingId) {
@@ -71,6 +58,7 @@ public class MarketBuildingRelEntity extends DomainObject{
 
     /**
      * 获取楼盘ID
+     *
      * @return 楼盘ID
      */
     public Integer getBuildingId() {
@@ -79,6 +67,7 @@ public class MarketBuildingRelEntity extends DomainObject{
 
     /**
      * 设置activeId
+     *
      * @param activeId activeId
      */
     public void setActiveId(Integer activeId) {
@@ -87,6 +76,7 @@ public class MarketBuildingRelEntity extends DomainObject{
 
     /**
      * 获取activeId
+     *
      * @return activeId
      */
     public Integer getActiveId() {
@@ -95,20 +85,24 @@ public class MarketBuildingRelEntity extends DomainObject{
 
     /**
      * 实体的toString方法
+     *
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("BuildingId",getBuildingId())
-			.append("ActiveId",getActiveId())
+                .append("Id", getId())
+                .append("BuildingId", getBuildingId())
+                .append("ActiveId", getActiveId())
                 .toString();
     }
 
     /**
      * 获取hash码
+     *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -117,15 +111,21 @@ public class MarketBuildingRelEntity extends DomainObject{
 
     /**
      * 对象比较
+     *
      * @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;
+        if (obj instanceof MarketBuildingRelEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        MarketBuildingRelEntity other = (MarketBuildingRelEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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,7 +3,8 @@ package com.house365.beans.entity;
 import com.house365.beans.system.DomainObject;
 
 /**
- * 新房城市配置
+ * 新房城市配置实体类
+ *
  * @author jay
  *         Created by Administrator on 2020/6/11.
  */

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,6 +392,7 @@ 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(
@@ -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,6 +458,7 @@ 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(
@@ -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
  * ------------------------------------------------------------------
@@ -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,6 +438,7 @@ public class ProjectSalerEntity extends DomainObject {
      *
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -465,12 +450,17 @@ public class ProjectSalerEntity extends DomainObject {
      * @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;
+        if (obj instanceof ProjectSalerEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ProjectSalerEntity other = (ProjectSalerEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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,6 +304,7 @@ 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(
@@ -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/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
  * Create at:   2017-07-17 上午 10:14:20
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,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 javax.validation.constraints.NotNull;
+
 /**
  * ReportChannelDepartRel数据库实体/领域对象<br>
  *
@@ -29,10 +30,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class ReportChannelDepartRelEntity extends DomainObject{
-	/**
-	 * 
-	 */
+public class ReportChannelDepartRelEntity extends DomainObject {
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -50,17 +49,7 @@ public class ReportChannelDepartRelEntity extends DomainObject{
     private Integer departId;
 
     //columns END
-	/*
-	public ReportChannelDepartRel(){
-	}
-
-	public ReportChannelDepartRel(
-		Integer id
-	){
-		this.id = id;
-	}
 
-    */
 
     /**
      * 设置channelId
@@ -98,11 +87,12 @@ public class ReportChannelDepartRelEntity extends DomainObject{
      * 实体的toString方法
      * @return 实体字符串
      */
+    @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-			.append("Id",getId())
-			.append("ChannelId",getChannelId())
-			.append("DepartId",getDepartId())
+                .append("Id", getId())
+                .append("ChannelId", getChannelId())
+                .append("DepartId", getDepartId())
                 .toString();
     }
 
@@ -110,6 +100,7 @@ public class ReportChannelDepartRelEntity extends DomainObject{
      * 获取hash码
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -121,12 +112,17 @@ public class ReportChannelDepartRelEntity extends DomainObject{
      * @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;
+        if (obj instanceof ReportChannelDepartRelEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ReportChannelDepartRelEntity other = (ReportChannelDepartRelEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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,6 +263,7 @@ 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(
@@ -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
  * ------------------------------------------------------------------
@@ -29,9 +30,7 @@ import org.hibernate.validator.constraints.Length;
  * @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())
@@ -500,6 +479,7 @@ public class ReportMarketingEntity extends DomainObject {
      * 获取hash码
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -511,12 +491,17 @@ public class ReportMarketingEntity extends DomainObject {
      * @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;
+        if (obj instanceof ReportMarketingEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        ReportMarketingEntity other = (ReportMarketingEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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
  * Create at:   2016-09-22 上午 11:32:19
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,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 javax.validation.constraints.NotNull;
+
 /**
  * 角色权限关联数据库实体/领域对象<br>
  *
@@ -29,10 +30,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class RolePermissionEntity extends DomainObject{
-	/**
-	 * 
-	 */
+public class RolePermissionEntity extends DomainObject {
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -66,17 +65,7 @@ public class RolePermissionEntity extends DomainObject{
     private Integer createUserid;
 
     //columns END
-	/*
-	public RolePermission(){
-	}
-
-	public RolePermission(
-		Integer id
-	){
-		this.id = id;
-	}
 
-    */
 
     /**
      * 设置roleId
@@ -184,13 +173,14 @@ public class RolePermissionEntity extends DomainObject{
      * 实体的toString方法
      * @return 实体字符串
      */
+    @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())
+                .append("Id", getId())
+                .append("RoleId", getRoleId())
+                .append("PermissionId", getPermissionId())
+                .append("CreateTime", getCreateTime())
+                .append("CreateUserid", getCreateUserid())
                 .toString();
     }
 
@@ -198,6 +188,7 @@ public class RolePermissionEntity extends DomainObject{
      * 获取hash码
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -209,12 +200,17 @@ public class RolePermissionEntity extends DomainObject{
      * @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;
+        if (obj instanceof RolePermissionEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        RolePermissionEntity other = (RolePermissionEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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,6 +283,7 @@ 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(
@@ -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
  * Create at:   2016-11-02 下午 17:54:57
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,13 +14,12 @@
  */
 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>
@@ -29,7 +29,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class StatusSourceStatisticsEntity extends DomainObject{
+public class StatusSourceStatisticsEntity extends DomainObject {
     /**
      *
      */
@@ -46,13 +46,13 @@ public class StatusSourceStatisticsEntity extends DomainObject{
     /**
      * 统计对象名称
      */
-	@Length(max=1000, message="长度需要大于0且小于1000")
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
     private String projectName;
 
     /**
      * 统计对象类型 1 部门 2 职员 3 项目 4状态
      */
-	@Length(max=45, message="长度需要大于0且小于45")
+    @Length(max = 45, message = "长度需要大于0且小于45")
     private String objectType;
 
     /**
@@ -76,19 +76,19 @@ public class StatusSourceStatisticsEntity extends DomainObject{
     /**
      * 来源名称
      */
-	@Length(max=1000, message="长度需要大于0且小于1000")
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
     private String sourceName;
 
     /**
      * 城市编码
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String city;
 
     /**
      * 城市名称
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String cityName;
 
     /**
@@ -312,18 +312,18 @@ public class StatusSourceStatisticsEntity extends DomainObject{
      */
     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())
+                .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();
     }
 
@@ -343,11 +343,11 @@ public class StatusSourceStatisticsEntity extends DomainObject{
      * @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;
+        if (obj instanceof StatusSourceStatisticsEntity == false) return false;
+        if (this == obj) return true;
+        StatusSourceStatisticsEntity other = (StatusSourceStatisticsEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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
  * Create at:   2016-09-22 上午 11:32:21
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,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 javax.validation.constraints.NotNull;
+
 /**
  * 角色权限关联数据库实体/领域对象<br>
  *
@@ -29,10 +30,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class UserRoleEntity extends DomainObject{
-	/**
-	 * 
-	 */
+public class UserRoleEntity extends DomainObject {
+
     private static final long serialVersionUID = 1L;
 
     //可以直接使用: @Length(max=50,message="用户名长度不能大于50")显示错误消息
@@ -55,27 +54,15 @@ public class UserRoleEntity extends DomainObject{
     /**
      * 创建时间
      */
-	
     private java.util.Date createTime;
 
     /**
      * 创建人用户ID
      */
-	
     private Integer createUserId;
 
     //columns END
-	/*
-	public UserRole(){
-	}
-
-	public UserRole(
-		Integer id
-	){
-		this.id = id;
-	}
 
-    */
 
     /**
      * 设置用户ID
@@ -102,7 +89,6 @@ public class UserRoleEntity extends DomainObject{
     }
 
 
-
     public String getRoleCode() {
         return roleCode;
     }
@@ -177,13 +163,14 @@ public class UserRoleEntity extends DomainObject{
      * 实体的toString方法
      * @return 实体字符串
      */
+    @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())
+                .append("Id", getId())
+                .append("UserId", getUserId())
+                .append("RoleId", getRoleId())
+                .append("CreateTime", getCreateTime())
+                .append("CreateUserId", getCreateUserId())
                 .toString();
     }
 
@@ -191,6 +178,7 @@ public class UserRoleEntity extends DomainObject{
      * 获取hash码
      * @return HASH码
      */
+    @Override
     public int hashCode() {
         return new HashCodeBuilder()
                 .append(getId())
@@ -202,12 +190,17 @@ public class UserRoleEntity extends DomainObject{
      * @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;
+        if (obj instanceof UserRoleEntity == false) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
+        UserRoleEntity other = (UserRoleEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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
  * Create at:   2016-10-25 上午 09:36:01
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,13 +14,11 @@
  */
 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>
@@ -29,7 +28,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class UserSourceStatisticsEntity extends StatisticObject{
+public class UserSourceStatisticsEntity extends StatisticObject {
     /**
      *
      */
@@ -46,13 +45,13 @@ public class UserSourceStatisticsEntity extends StatisticObject{
     /**
      * 统计对象名称
      */
-	@Length(max=1000, message="长度需要大于0且小于1000")
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
     private String projectName;
 
     /**
      * 统计对象类型 1 部门 2 职员 3 项目
      */
-	@Length(max=45, message="长度需要大于0且小于45")
+    @Length(max = 45, message = "长度需要大于0且小于45")
     private String objectType;
 
     /**
@@ -76,19 +75,19 @@ public class UserSourceStatisticsEntity extends StatisticObject{
     /**
      * 来源名称
      */
-	@Length(max=1000, message="长度需要大于0且小于1000")
+    @Length(max = 1000, message = "长度需要大于0且小于1000")
     private String sourceName;
 
     /**
      * 城市编码
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String city;
 
     /**
      * 城市名称
      */
-	@Length(max=20, message="长度需要大于0且小于20")
+    @Length(max = 20, message = "长度需要大于0且小于20")
     private String cityName;
 
     /**
@@ -312,18 +311,18 @@ public class UserSourceStatisticsEntity extends StatisticObject{
      */
     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())
+                .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();
     }
 
@@ -343,11 +342,11 @@ public class UserSourceStatisticsEntity extends StatisticObject{
      * @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;
+        if (obj instanceof UserSourceStatisticsEntity == false) return false;
+        if (this == obj) return true;
+        UserSourceStatisticsEntity other = (UserSourceStatisticsEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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
  * Create at:   2017-05-15 下午 17:04:55
- *  
+ * <p>
  * Modification History:
  * Date         Author      Version     Description
  * ------------------------------------------------------------------
@@ -13,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 javax.validation.constraints.NotNull;
+
 /**
  * UserStar数据库实体/领域对象<br>
  *
@@ -29,7 +30,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @see
  * @since 1.0
  */
-public class UserStarEntity extends DomainObject{
+public class UserStarEntity extends DomainObject {
     /**
      *
      */
@@ -158,11 +159,11 @@ public class UserStarEntity extends DomainObject{
      */
     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())
+                .append("Id", getId())
+                .append("UserId", getUserId())
+                .append("StarUserId", getStarUserId())
+                .append("Star", getStar())
+                .append("CreateTime", getCreateTime())
                 .toString();
     }
 
@@ -182,11 +183,11 @@ public class UserStarEntity extends DomainObject{
      * @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;
+        if (obj instanceof UserStarEntity == false) return false;
+        if (this == obj) return true;
+        UserStarEntity other = (UserStarEntity) obj;
         return new EqualsBuilder()
-			.append(getId(),other.getId())
+                .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/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);
 }