Ver código fonte

新增派单刷新客户最新签单

anderx 1 ano atrás
pai
commit
4ca4a55b83

+ 3 - 2
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -20,13 +20,14 @@ import java.util.List;
 import java.util.Map;
 
 public interface UserMapper {
-    int deleteByPrimaryKey(String id);
+
+    int deleteByPrimaryKey(Long id);
 
     int insert(User record);
 
     int insertSelective(User record);
 
-    User selectByPrimaryKey(String id);
+    User selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(User record);
 

Diferenças do arquivo suprimidas por serem muito extensas
+ 1482 - 1619
src/main/java/com/goafanti/common/mapper/UserMapper.xml


+ 425 - 4
src/main/java/com/goafanti/common/model/User.java

@@ -3,8 +3,8 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 /**
- * user
- * @author
+ * 
+ * @TableName user
  */
 public class User implements AftUser{
     private String id;
@@ -209,335 +209,756 @@ public class User implements AftUser{
      */
     private Integer newChannel;
 
+    /**
+     * 签单时间(最近)
+     */
+    private Date signTime;
+
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 
+     */
     public String getId() {
         return id;
     }
 
+    /**
+     * 
+     */
     public void setId(String id) {
         this.id = id;
     }
 
+    /**
+     * 手机号
+     */
     public String getMobile() {
         return mobile;
     }
 
+    /**
+     * 手机号
+     */
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
 
+    /**
+     * 密码,md5+salt
+     */
     public String getPassword() {
         return password;
     }
 
+    /**
+     * 密码,md5+salt
+     */
     public void setPassword(String password) {
         this.password = password;
     }
 
+    /**
+     * 用户昵称
+     */
     public String getNickname() {
         return nickname;
     }
 
+    /**
+     * 用户昵称
+     */
     public void setNickname(String nickname) {
         this.nickname = nickname;
     }
 
+    /**
+     * 用户邮箱
+     */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * 用户邮箱
+     */
     public void setEmail(String email) {
         this.email = email;
     }
 
+    /**
+     * 注册时间
+     */
     public Date getCreateTime() {
         return createTime;
     }
 
+    /**
+     * 注册时间
+     */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
+    /**
+     * 用户编号
+     */
     public Long getNumber() {
         return number;
     }
 
+    /**
+     * 用户编号
+     */
     public void setNumber(Long number) {
         this.number = number;
     }
 
+    /**
+     * 会员等级
+     */
     public Integer getLvl() {
         return lvl;
     }
 
+    /**
+     * 会员等级
+     */
     public void setLvl(Integer lvl) {
         this.lvl = lvl;
     }
 
+    /**
+     * 个人/单位,默认0-个人账号,1-组织账号
+     */
     public Integer getType() {
         return type;
     }
 
+    /**
+     * 个人/单位,默认0-个人账号,1-组织账号
+     */
     public void setType(Integer type) {
         this.type = type;
     }
 
+    /**
+     * 管理员ID
+     */
     public String getAid() {
         return aid;
     }
 
+    /**
+     * 管理员ID
+     */
     public void setAid(String aid) {
         this.aid = aid;
     }
 
+    /**
+     * 客户经理ID
+     */
     public String getMid() {
         return mid;
     }
 
+    /**
+     * 客户经理ID
+     */
     public void setMid(String mid) {
         this.mid = mid;
     }
 
+    /**
+     * 账户状态 0-有效 1-失效 2-锁定
+     */
     public Integer getStatus() {
         return status;
     }
 
+    /**
+     * 账户状态 0-有效 1-失效 2-锁定
+     */
     public void setStatus(Integer status) {
         this.status = status;
     }
 
+    /**
+     * 用户来源 0 注册 1 录入 2 领取 3 转交
+     */
     public Integer getSource() {
         return source;
     }
 
+    /**
+     * 用户来源 0 注册 1 录入 2 领取 3 转交
+     */
     public void setSource(Integer source) {
         this.source = source;
     }
 
+    /**
+     * 更新时间
+     */
     public Date getUpdateTime() {
         return updateTime;
     }
 
+    /**
+     * 更新时间
+     */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
+    /**
+     * 公司LOGO
+     */
     public String getCompanyLogoUrl() {
         return companyLogoUrl;
     }
 
+    /**
+     * 公司LOGO
+     */
     public void setCompanyLogoUrl(String companyLogoUrl) {
         this.companyLogoUrl = companyLogoUrl;
     }
 
+    /**
+     * 个人头像
+     */
     public String getHeadPortraitUrl() {
         return headPortraitUrl;
     }
 
+    /**
+     * 个人头像
+     */
     public void setHeadPortraitUrl(String headPortraitUrl) {
         this.headPortraitUrl = headPortraitUrl;
     }
 
+    /**
+     * 社会属性标签
+     */
     public String getSocietyTag() {
         return societyTag;
     }
 
+    /**
+     * 社会属性标签
+     */
     public void setSocietyTag(String societyTag) {
         this.societyTag = societyTag;
     }
 
+    /**
+     * 简介
+     */
     public String getIntroduction() {
         return introduction;
     }
 
+    /**
+     * 简介
+     */
     public void setIntroduction(String introduction) {
         this.introduction = introduction;
     }
 
+    /**
+     * 增值属性标签
+     */
     public String getValueAddedTag() {
         return valueAddedTag;
     }
 
+    /**
+     * 增值属性标签
+     */
     public void setValueAddedTag(String valueAddedTag) {
         this.valueAddedTag = valueAddedTag;
     }
 
+    /**
+     * 所属单位用户ID
+     */
     public String getOrganizationId() {
         return organizationId;
     }
 
+    /**
+     * 所属单位用户ID
+     */
     public void setOrganizationId(String organizationId) {
         this.organizationId = organizationId;
     }
 
+    /**
+     * 共享类型 0=私有 1=公共 2=签单 3=外联 4=渠道
+     */
     public Integer getShareType() {
         return shareType;
     }
 
+    /**
+     * 共享类型 0=私有 1=公共 2=签单 3=外联 4=渠道
+     */
     public void setShareType(Integer shareType) {
         this.shareType = shareType;
     }
 
+    /**
+     * 客户认证名称
+     */
     public String getIdentifyName() {
         return identifyName;
     }
 
+    /**
+     * 客户认证名称
+     */
     public void setIdentifyName(String identifyName) {
         this.identifyName = identifyName;
     }
 
+    /**
+     * 专家详情背景图
+     */
     public String getBackgroundUrl() {
         return backgroundUrl;
     }
 
+    /**
+     * 专家详情背景图
+     */
     public void setBackgroundUrl(String backgroundUrl) {
         this.backgroundUrl = backgroundUrl;
     }
 
+    /**
+     * 客户审核状态 0-待审核 ,1-审核通过,2-审核拒绝
+     */
     public Integer getAuditStatus() {
         return auditStatus;
     }
 
+    /**
+     * 客户审核状态 0-待审核 ,1-审核通过,2-审核拒绝
+     */
     public void setAuditStatus(Integer auditStatus) {
         this.auditStatus = auditStatus;
     }
 
+    /**
+     * 审核意见
+     */
     public String getAuditOpinion() {
         return auditOpinion;
     }
 
+    /**
+     * 审核意见
+     */
     public void setAuditOpinion(String auditOpinion) {
         this.auditOpinion = auditOpinion;
     }
 
+    /**
+     * 客户转换时间
+     */
     public Date getTransferTime() {
         return transferTime;
     }
 
+    /**
+     * 客户转换时间
+     */
     public void setTransferTime(Date transferTime) {
         this.transferTime = transferTime;
     }
 
+    /**
+     * 资料维护人
+     */
     public String getInformationMaintainer() {
         return informationMaintainer;
     }
 
+    /**
+     * 资料维护人
+     */
     public void setInformationMaintainer(String informationMaintainer) {
         this.informationMaintainer = informationMaintainer;
     }
 
+    /**
+     * 核心技术
+     */
     public String getCoreTechnology() {
         return coreTechnology;
     }
 
+    /**
+     * 核心技术
+     */
     public void setCoreTechnology(String coreTechnology) {
         this.coreTechnology = coreTechnology;
     }
 
+    /**
+     * 客户已完成项目情况
+     */
     public String getAccomplishSituation() {
         return accomplishSituation;
     }
 
+    /**
+     * 客户已完成项目情况
+     */
     public void setAccomplishSituation(String accomplishSituation) {
         this.accomplishSituation = accomplishSituation;
     }
 
+    /**
+     * 已有知识产权情况
+     */
     public String getIntellectualProperty() {
         return intellectualProperty;
     }
 
+    /**
+     * 已有知识产权情况
+     */
     public void setIntellectualProperty(String intellectualProperty) {
         this.intellectualProperty = intellectualProperty;
     }
 
+    /**
+     * 信用等级 1 A级优质,2 B级正常,3 C级失信
+     */
     public Integer getCreditRating() {
         return creditRating;
     }
 
+    /**
+     * 信用等级 1 A级优质,2 B级正常,3 C级失信
+     */
     public void setCreditRating(Integer creditRating) {
         this.creditRating = creditRating;
     }
 
+    /**
+     * 用户等级 0 一般客户 1 意向客户 2 重点客户
+     */
     public Integer getLevel() {
         return level;
     }
 
+    /**
+     * 用户等级 0 一般客户 1 意向客户 2 重点客户
+     */
     public void setLevel(Integer level) {
         this.level = level;
     }
 
+    /**
+     * 0-未认证,1-已认证
+     */
     public Integer getAuthentication() {
         return authentication;
     }
 
+    /**
+     * 0-未认证,1-已认证
+     */
     public void setAuthentication(Integer authentication) {
         this.authentication = authentication;
     }
 
+    /**
+     * 用户注册名
+     */
     public String getUsername() {
         return username;
     }
 
+    /**
+     * 用户注册名
+     */
     public void setUsername(String username) {
         this.username = username;
     }
 
+    /**
+     * 完整度
+     */
     public Double getIntegrity() {
         return integrity;
     }
 
+    /**
+     * 完整度
+     */
     public void setIntegrity(Double integrity) {
         this.integrity = integrity;
     }
 
+    /**
+     * 邀请码
+     */
     public String getToInviteCode() {
         return toInviteCode;
     }
 
+    /**
+     * 邀请码
+     */
     public void setToInviteCode(String toInviteCode) {
         this.toInviteCode = toInviteCode;
     }
 
+    /**
+     * 受邀请码
+     */
     public String getBeInviteCode() {
         return beInviteCode;
     }
 
+    /**
+     * 受邀请码
+     */
     public void setBeInviteCode(String beInviteCode) {
         this.beInviteCode = beInviteCode;
     }
 
+    /**
+     * 指导 0无 1有
+     */
     public Integer getGuidance() {
         return guidance;
     }
 
+    /**
+     * 指导 0无 1有
+     */
     public void setGuidance(Integer guidance) {
         this.guidance = guidance;
     }
 
+    /**
+     * 签单标记 0未签单 1已签单
+     */
     public Integer getSignBills() {
         return signBills;
     }
 
+    /**
+     * 签单标记 0未签单 1已签单
+     */
     public void setSignBills(Integer signBills) {
         this.signBills = signBills;
     }
 
+    /**
+     * 外联客户 0否 1是
+     */
     public Integer getChannel() {
         return channel;
     }
 
+    /**
+     * 外联客户 0否 1是
+     */
     public void setChannel(Integer channel) {
         this.channel = channel;
     }
 
+    /**
+     * 渠道客户 0否 1是
+     */
     public Integer getNewChannel() {
         return newChannel;
     }
 
+    /**
+     * 渠道客户 0否 1是
+     */
     public void setNewChannel(Integer newChannel) {
         this.newChannel = newChannel;
     }
 
-
-}
+    /**
+     * 签单时间(最近)
+     */
+    public Date getSignTime() {
+        return signTime;
+    }
+
+    /**
+     * 签单时间(最近)
+     */
+    public void setSignTime(Date signTime) {
+        this.signTime = signTime;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        User other = (User) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile()))
+            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
+            && (this.getNickname() == null ? other.getNickname() == null : this.getNickname().equals(other.getNickname()))
+            && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getNumber() == null ? other.getNumber() == null : this.getNumber().equals(other.getNumber()))
+            && (this.getLvl() == null ? other.getLvl() == null : this.getLvl().equals(other.getLvl()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getAid() == null ? other.getAid() == null : this.getAid().equals(other.getAid()))
+            && (this.getMid() == null ? other.getMid() == null : this.getMid().equals(other.getMid()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getSource() == null ? other.getSource() == null : this.getSource().equals(other.getSource()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getCompanyLogoUrl() == null ? other.getCompanyLogoUrl() == null : this.getCompanyLogoUrl().equals(other.getCompanyLogoUrl()))
+            && (this.getHeadPortraitUrl() == null ? other.getHeadPortraitUrl() == null : this.getHeadPortraitUrl().equals(other.getHeadPortraitUrl()))
+            && (this.getSocietyTag() == null ? other.getSocietyTag() == null : this.getSocietyTag().equals(other.getSocietyTag()))
+            && (this.getIntroduction() == null ? other.getIntroduction() == null : this.getIntroduction().equals(other.getIntroduction()))
+            && (this.getValueAddedTag() == null ? other.getValueAddedTag() == null : this.getValueAddedTag().equals(other.getValueAddedTag()))
+            && (this.getOrganizationId() == null ? other.getOrganizationId() == null : this.getOrganizationId().equals(other.getOrganizationId()))
+            && (this.getShareType() == null ? other.getShareType() == null : this.getShareType().equals(other.getShareType()))
+            && (this.getIdentifyName() == null ? other.getIdentifyName() == null : this.getIdentifyName().equals(other.getIdentifyName()))
+            && (this.getBackgroundUrl() == null ? other.getBackgroundUrl() == null : this.getBackgroundUrl().equals(other.getBackgroundUrl()))
+            && (this.getAuditStatus() == null ? other.getAuditStatus() == null : this.getAuditStatus().equals(other.getAuditStatus()))
+            && (this.getAuditOpinion() == null ? other.getAuditOpinion() == null : this.getAuditOpinion().equals(other.getAuditOpinion()))
+            && (this.getTransferTime() == null ? other.getTransferTime() == null : this.getTransferTime().equals(other.getTransferTime()))
+            && (this.getInformationMaintainer() == null ? other.getInformationMaintainer() == null : this.getInformationMaintainer().equals(other.getInformationMaintainer()))
+            && (this.getCoreTechnology() == null ? other.getCoreTechnology() == null : this.getCoreTechnology().equals(other.getCoreTechnology()))
+            && (this.getAccomplishSituation() == null ? other.getAccomplishSituation() == null : this.getAccomplishSituation().equals(other.getAccomplishSituation()))
+            && (this.getIntellectualProperty() == null ? other.getIntellectualProperty() == null : this.getIntellectualProperty().equals(other.getIntellectualProperty()))
+            && (this.getCreditRating() == null ? other.getCreditRating() == null : this.getCreditRating().equals(other.getCreditRating()))
+            && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel()))
+            && (this.getAuthentication() == null ? other.getAuthentication() == null : this.getAuthentication().equals(other.getAuthentication()))
+            && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
+            && (this.getIntegrity() == null ? other.getIntegrity() == null : this.getIntegrity().equals(other.getIntegrity()))
+            && (this.getToInviteCode() == null ? other.getToInviteCode() == null : this.getToInviteCode().equals(other.getToInviteCode()))
+            && (this.getBeInviteCode() == null ? other.getBeInviteCode() == null : this.getBeInviteCode().equals(other.getBeInviteCode()))
+            && (this.getGuidance() == null ? other.getGuidance() == null : this.getGuidance().equals(other.getGuidance()))
+            && (this.getSignBills() == null ? other.getSignBills() == null : this.getSignBills().equals(other.getSignBills()))
+            && (this.getChannel() == null ? other.getChannel() == null : this.getChannel().equals(other.getChannel()))
+            && (this.getNewChannel() == null ? other.getNewChannel() == null : this.getNewChannel().equals(other.getNewChannel()))
+            && (this.getSignTime() == null ? other.getSignTime() == null : this.getSignTime().equals(other.getSignTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode());
+        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
+        result = prime * result + ((getNickname() == null) ? 0 : getNickname().hashCode());
+        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getNumber() == null) ? 0 : getNumber().hashCode());
+        result = prime * result + ((getLvl() == null) ? 0 : getLvl().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getAid() == null) ? 0 : getAid().hashCode());
+        result = prime * result + ((getMid() == null) ? 0 : getMid().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getSource() == null) ? 0 : getSource().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getCompanyLogoUrl() == null) ? 0 : getCompanyLogoUrl().hashCode());
+        result = prime * result + ((getHeadPortraitUrl() == null) ? 0 : getHeadPortraitUrl().hashCode());
+        result = prime * result + ((getSocietyTag() == null) ? 0 : getSocietyTag().hashCode());
+        result = prime * result + ((getIntroduction() == null) ? 0 : getIntroduction().hashCode());
+        result = prime * result + ((getValueAddedTag() == null) ? 0 : getValueAddedTag().hashCode());
+        result = prime * result + ((getOrganizationId() == null) ? 0 : getOrganizationId().hashCode());
+        result = prime * result + ((getShareType() == null) ? 0 : getShareType().hashCode());
+        result = prime * result + ((getIdentifyName() == null) ? 0 : getIdentifyName().hashCode());
+        result = prime * result + ((getBackgroundUrl() == null) ? 0 : getBackgroundUrl().hashCode());
+        result = prime * result + ((getAuditStatus() == null) ? 0 : getAuditStatus().hashCode());
+        result = prime * result + ((getAuditOpinion() == null) ? 0 : getAuditOpinion().hashCode());
+        result = prime * result + ((getTransferTime() == null) ? 0 : getTransferTime().hashCode());
+        result = prime * result + ((getInformationMaintainer() == null) ? 0 : getInformationMaintainer().hashCode());
+        result = prime * result + ((getCoreTechnology() == null) ? 0 : getCoreTechnology().hashCode());
+        result = prime * result + ((getAccomplishSituation() == null) ? 0 : getAccomplishSituation().hashCode());
+        result = prime * result + ((getIntellectualProperty() == null) ? 0 : getIntellectualProperty().hashCode());
+        result = prime * result + ((getCreditRating() == null) ? 0 : getCreditRating().hashCode());
+        result = prime * result + ((getLevel() == null) ? 0 : getLevel().hashCode());
+        result = prime * result + ((getAuthentication() == null) ? 0 : getAuthentication().hashCode());
+        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
+        result = prime * result + ((getIntegrity() == null) ? 0 : getIntegrity().hashCode());
+        result = prime * result + ((getToInviteCode() == null) ? 0 : getToInviteCode().hashCode());
+        result = prime * result + ((getBeInviteCode() == null) ? 0 : getBeInviteCode().hashCode());
+        result = prime * result + ((getGuidance() == null) ? 0 : getGuidance().hashCode());
+        result = prime * result + ((getSignBills() == null) ? 0 : getSignBills().hashCode());
+        result = prime * result + ((getChannel() == null) ? 0 : getChannel().hashCode());
+        result = prime * result + ((getNewChannel() == null) ? 0 : getNewChannel().hashCode());
+        result = prime * result + ((getSignTime() == null) ? 0 : getSignTime().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", mobile=").append(mobile);
+        sb.append(", password=").append(password);
+        sb.append(", nickname=").append(nickname);
+        sb.append(", email=").append(email);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", number=").append(number);
+        sb.append(", lvl=").append(lvl);
+        sb.append(", type=").append(type);
+        sb.append(", aid=").append(aid);
+        sb.append(", mid=").append(mid);
+        sb.append(", status=").append(status);
+        sb.append(", source=").append(source);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", companyLogoUrl=").append(companyLogoUrl);
+        sb.append(", headPortraitUrl=").append(headPortraitUrl);
+        sb.append(", societyTag=").append(societyTag);
+        sb.append(", introduction=").append(introduction);
+        sb.append(", valueAddedTag=").append(valueAddedTag);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", shareType=").append(shareType);
+        sb.append(", identifyName=").append(identifyName);
+        sb.append(", backgroundUrl=").append(backgroundUrl);
+        sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", auditOpinion=").append(auditOpinion);
+        sb.append(", transferTime=").append(transferTime);
+        sb.append(", informationMaintainer=").append(informationMaintainer);
+        sb.append(", coreTechnology=").append(coreTechnology);
+        sb.append(", accomplishSituation=").append(accomplishSituation);
+        sb.append(", intellectualProperty=").append(intellectualProperty);
+        sb.append(", creditRating=").append(creditRating);
+        sb.append(", level=").append(level);
+        sb.append(", authentication=").append(authentication);
+        sb.append(", username=").append(username);
+        sb.append(", integrity=").append(integrity);
+        sb.append(", toInviteCode=").append(toInviteCode);
+        sb.append(", beInviteCode=").append(beInviteCode);
+        sb.append(", guidance=").append(guidance);
+        sb.append(", signBills=").append(signBills);
+        sb.append(", channel=").append(channel);
+        sb.append(", newChannel=").append(newChannel);
+        sb.append(", signTime=").append(signTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}