协销数据整理

src/main/java/com/caimei/modules/user/entity/NewCmSp.java

@@ -1,10 +1,9 @@
 package com.caimei.modules.user.entity;
 
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-
 import com.thinkgem.jeesite.common.persistence.DataEntity;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotNull;
 import java.beans.Transient;
 
 /**
@@ -18,52 +17,61 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 	private Integer serviceProviderID;		// serviceProviderID
 	private Integer userID;		// 对应的userId
 	private String name;		// 名称
-	private String nameEn;		// 英文名
-	private String site;		// 网址
-	private String logo;		// 头像
-	private String halfBodyImage;		// 半身照
-	private String legalPerson;		// 法人代表
-	private Integer townID;		// 所在县区Id
-	private String address;		// 地址
+	private String linkMan;		// 联系人（默认联系人）
 	private String contractPhone;		// 联系电话
 	private String contractMobile;		// 联系手机
-	private String fax;		// fax
-	private String zipCode;		// 邮编
-	private String registeredCapital;		// 注册资金
-	private String turnover;		// turnover
-	private String count1;		// 团队人数
-	private String count2;		// count2
-	private String linkMan1;		// 联系人1（默认联系人）
-	private String duty1;		// 联系人1职务
-	private String contractPhone1;		// 联系人1固定电话
-	private String contractMobile1;		// 联系人1手机
-	private String contractQQ1;		// 联系人1QQ
-	private String wechat1;		// 联系人1微信
-	private String contractEmail1;		// 联系人1邮箱
-	private String linkMan2;		// 联系人2
-	private String duty2;		// 联系人2职务
-	private String contractPhone2;		// 联系人2固定电话
-	private String contractMobile2;		// 联系人2手机
-	private String contractQQ2;		// 联系人2QQ
-	private String wechat2;		// 联系人2微信
-	private String contractEmail2;		// 联系人2邮箱
-	private String info;		// 团队介绍
-	private Double commissionRate;		// commissionRate
-	private String provinceIDs;		// 服务区域Id
-	private String provinceNames;		// 服务区域名称
-	private Integer level;		// level
-	private String payFlag1;		// payFlag1
-	private String businessLicenseImage;		// 营业执照
-	private String taxCertificateImage;		// 税务登记证
+	private String contractEmail;		// 联系人邮箱
+	private String duty;		// 联系人职务
 	private String auditStatus;		// 审核状态
 	private String auditTime;		// 审核时间
 	private String auditNote;		// 审核信息
-	private String validFlag;		// 是否可用 1可用
+	private String validFlag;		// 是否可用 可用
 	private Integer status;		// 创客状态，见表c_serviceproviderstatus或枚举ServiceProviderStatus
 	private String addTime;		// 创建时间
-	private Integer serviceLevelID;		// serviceLevelID
-	private Integer typeID;		// typeID
 	private Integer mainServiceProviderID;		// 创客经理Id
+
+//	private String nameEn;		// 英文名
+//	private String site;		// 网址
+//	private String logo;		// 头像
+//	private String halfBodyImage;		// 半身照
+//	private String legalPerson;		// 法人代表
+//	private Integer townID;		// 所在县区Id
+//	private String address;		// 地址
+//
+//
+//
+//	private String fax;		// fax
+//	private String zipCode;		// 邮编
+//	private String registeredCapital;		// 注册资金
+//	private String turnover;		// turnover
+//	private String count;		// 团队人数
+//	private String count2;		// count2
+//
+//
+//	private String contractPhone;		// 联系人固定电话
+//	private String contractMobile;		// 联系人手机
+//	private String contractQQ;		// 联系人QQ
+//	private String wechat;		// 联系人微信
+//
+//	private String linkMan2;		// 联系人2
+//	private String duty2;		// 联系人2职务
+//	private String contractPhone2;		// 联系人2固定电话
+//	private String contractMobile2;		// 联系人2手机
+//	private String contractQQ2;		// 联系人2QQ
+//	private String wechat2;		// 联系人2微信
+//	private String contractEmail2;		// 联系人2邮箱
+//	private String info;		// 团队介绍
+//	private Double commissionRate;		// commissionRate
+//	private String provinceIDs;		// 服务区域Id
+//	private String provinceNames;		// 服务区域名称
+//	private Integer level;		// level
+//	private String payFlag;		// payFlag
+//	private String businessLicenseImage;		// 营业执照
+//	private String taxCertificateImage;		// 税务登记证
+//
+//	private Integer serviceLevelID;		// serviceLevelID
+//	private Integer typeID;		// typeID
+
 	private String businessScope;		// 专业领域
 	private String companyImage;		// 形象展示
 	private String cashDeposit;		// cashDeposit
@@ -73,7 +81,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 	private String serviceCase;		// 服务案例
 	private String spIdentity; //前台身份展示
 	private String spStatusName; //前台状态展示
-	private String position; //职位 0=协销员工 1=协销经理
+	private String position; //职位 0=协销员工 =协销经理
 
 	public NewCmSp() {
 		super();
@@ -109,335 +117,335 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.name = name;
 	}
 
-	@Length(min=0, max=100, message="英文名长度必须介于 0 和 100 之间")
-	public String getNameEn() {
-		return nameEn;
-	}
-
-	public void setNameEn(String nameEn) {
-		this.nameEn = nameEn;
-	}
-
-	@Length(min=0, max=200, message="网址长度必须介于 0 和 200 之间")
-	public String getSite() {
-		return site;
-	}
-
-	public void setSite(String site) {
-		this.site = site;
-	}
-
-	@Length(min=0, max=200, message="头像长度必须介于 0 和 200 之间")
-	public String getLogo() {
-		return logo;
-	}
-
-	public void setLogo(String logo) {
-		this.logo = logo;
-	}
-
-	@Length(min=0, max=255, message="半身照长度必须介于 0 和 255 之间")
-	public String getHalfBodyImage() {
-		return halfBodyImage;
-	}
-
-	public void setHalfBodyImage(String halfBodyImage) {
-		this.halfBodyImage = halfBodyImage;
-	}
-
-	@Length(min=0, max=20, message="法人代表长度必须介于 0 和 20 之间")
-	public String getLegalPerson() {
-		return legalPerson;
-	}
-
-	public void setLegalPerson(String legalPerson) {
-		this.legalPerson = legalPerson;
-	}
-
-	public Integer getTownID() {
-		return townID;
-	}
-
-	public void setTownID(Integer townID) {
-		this.townID = townID;
-	}
-
-	@Length(min=0, max=100, message="地址长度必须介于 0 和 100 之间")
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	@Length(min=0, max=50, message="联系电话长度必须介于 0 和 50 之间")
-	public String getContractPhone() {
-		return contractPhone;
-	}
-
-	public void setContractPhone(String contractPhone) {
-		this.contractPhone = contractPhone;
-	}
-
-	@Length(min=0, max=20, message="联系手机长度必须介于 0 和 20 之间")
-	public String getContractMobile() {
-		return contractMobile;
-	}
-
-	public void setContractMobile(String contractMobile) {
-		this.contractMobile = contractMobile;
-	}
-
-	@Length(min=0, max=50, message="fax长度必须介于 0 和 50 之间")
-	public String getFax() {
-		return fax;
-	}
-
-	public void setFax(String fax) {
-		this.fax = fax;
-	}
-
-	@Length(min=0, max=10, message="邮编长度必须介于 0 和 10 之间")
-	public String getZipCode() {
-		return zipCode;
-	}
-
-	public void setZipCode(String zipCode) {
-		this.zipCode = zipCode;
-	}
-
-	public String getRegisteredCapital() {
-		return registeredCapital;
-	}
-
-	public void setRegisteredCapital(String registeredCapital) {
-		this.registeredCapital = registeredCapital;
-	}
-
-	public String getTurnover() {
-		return turnover;
-	}
-
-	public void setTurnover(String turnover) {
-		this.turnover = turnover;
-	}
-
-	@Length(min=0, max=11, message="团队人数长度必须介于 0 和 11 之间")
-	public String getCount1() {
-		return count1;
-	}
-
-	public void setCount1(String count1) {
-		this.count1 = count1;
-	}
-
-	@Length(min=0, max=11, message="count2长度必须介于 0 和 11 之间")
-	public String getCount2() {
-		return count2;
-	}
-
-	public void setCount2(String count2) {
-		this.count2 = count2;
-	}
-
-	@Length(min=0, max=50, message="联系人1（默认联系人）长度必须介于 0 和 50 之间")
-	public String getLinkMan1() {
-		return linkMan1;
-	}
-
-	public void setLinkMan1(String linkMan1) {
-		this.linkMan1 = linkMan1;
-	}
-
-	@Length(min=0, max=50, message="联系人1职务长度必须介于 0 和 50 之间")
-	public String getDuty1() {
-		return duty1;
-	}
-
-	public void setDuty1(String duty1) {
-		this.duty1 = duty1;
-	}
-
-	@Length(min=0, max=50, message="联系人1固定电话长度必须介于 0 和 50 之间")
-	public String getContractPhone1() {
-		return contractPhone1;
-	}
-
-	public void setContractPhone1(String contractPhone1) {
-		this.contractPhone1 = contractPhone1;
-	}
-
-	@Length(min=0, max=20, message="联系人1手机长度必须介于 0 和 20 之间")
-	public String getContractMobile1() {
-		return contractMobile1;
-	}
-
-	public void setContractMobile1(String contractMobile1) {
-		this.contractMobile1 = contractMobile1;
-	}
-
-	@Length(min=0, max=20, message="联系人1QQ长度必须介于 0 和 20 之间")
-	public String getContractQQ1() {
-		return contractQQ1;
-	}
-
-	public void setContractQQ1(String contractQQ1) {
-		this.contractQQ1 = contractQQ1;
-	}
-
-	@Length(min=0, max=50, message="联系人1微信长度必须介于 0 和 50 之间")
-	public String getWechat1() {
-		return wechat1;
-	}
-
-	public void setWechat1(String wechat1) {
-		this.wechat1 = wechat1;
-	}
-
-	@Length(min=0, max=50, message="联系人1邮箱长度必须介于 0 和 50 之间")
-	public String getContractEmail1() {
-		return contractEmail1;
-	}
-
-	public void setContractEmail1(String contractEmail1) {
-		this.contractEmail1 = contractEmail1;
-	}
-
-	@Length(min=0, max=50, message="联系人2长度必须介于 0 和 50 之间")
-	public String getLinkMan2() {
-		return linkMan2;
-	}
-
-	public void setLinkMan2(String linkMan2) {
-		this.linkMan2 = linkMan2;
-	}
-
-	@Length(min=0, max=50, message="联系人2职务长度必须介于 0 和 50 之间")
-	public String getDuty2() {
-		return duty2;
-	}
-
-	public void setDuty2(String duty2) {
-		this.duty2 = duty2;
-	}
-
-	@Length(min=0, max=50, message="联系人2固定电话长度必须介于 0 和 50 之间")
-	public String getContractPhone2() {
-		return contractPhone2;
-	}
-
-	public void setContractPhone2(String contractPhone2) {
-		this.contractPhone2 = contractPhone2;
-	}
-
-	@Length(min=0, max=20, message="联系人2手机长度必须介于 0 和 20 之间")
-	public String getContractMobile2() {
-		return contractMobile2;
-	}
-
-	public void setContractMobile2(String contractMobile2) {
-		this.contractMobile2 = contractMobile2;
-	}
-
-	@Length(min=0, max=20, message="联系人2QQ长度必须介于 0 和 20 之间")
-	public String getContractQQ2() {
-		return contractQQ2;
-	}
-
-	public void setContractQQ2(String contractQQ2) {
-		this.contractQQ2 = contractQQ2;
-	}
-
-	@Length(min=0, max=50, message="联系人2微信长度必须介于 0 和 50 之间")
-	public String getWechat2() {
-		return wechat2;
-	}
-
-	public void setWechat2(String wechat2) {
-		this.wechat2 = wechat2;
-	}
-
-	@Length(min=0, max=50, message="联系人2邮箱长度必须介于 0 和 50 之间")
-	public String getContractEmail2() {
-		return contractEmail2;
-	}
-
-	public void setContractEmail2(String contractEmail2) {
-		this.contractEmail2 = contractEmail2;
-	}
-
-	@Length(min=0, max=500, message="团队介绍长度必须介于 0 和 500 之间")
-	public String getInfo() {
-		return info;
-	}
-
-	public void setInfo(String info) {
-		this.info = info;
-	}
-
-	public Double getCommissionRate() {
-		return commissionRate;
-	}
-
-	public void setCommissionRate(Double commissionRate) {
-		this.commissionRate = commissionRate;
-	}
-
-	@Length(min=0, max=300, message="服务区域Id长度必须介于 0 和 300 之间")
-	public String getProvinceIDs() {
-		return provinceIDs;
-	}
-
-	public void setProvinceIDs(String provinceIDs) {
-		this.provinceIDs = provinceIDs;
-	}
-
-	@Length(min=0, max=300, message="服务区域名称长度必须介于 0 和 300 之间")
-	public String getProvinceNames() {
-		return provinceNames;
-	}
-
-	public void setProvinceNames(String provinceNames) {
-		this.provinceNames = provinceNames;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	@Length(min=0, max=1, message="payFlag1长度必须介于 0 和 1 之间")
-	public String getPayFlag1() {
-		return payFlag1;
-	}
-
-	public void setPayFlag1(String payFlag1) {
-		this.payFlag1 = payFlag1;
-	}
-
-	@Length(min=0, max=200, message="营业执照长度必须介于 0 和 200 之间")
-	public String getBusinessLicenseImage() {
-		return businessLicenseImage;
-	}
-
-	public void setBusinessLicenseImage(String businessLicenseImage) {
-		this.businessLicenseImage = businessLicenseImage;
-	}
-
-	@Length(min=0, max=200, message="税务登记证长度必须介于 0 和 200 之间")
-	public String getTaxCertificateImage() {
-		return taxCertificateImage;
-	}
-
-	public void setTaxCertificateImage(String taxCertificateImage) {
-		this.taxCertificateImage = taxCertificateImage;
-	}
-
-	@Length(min=0, max=1, message="审核状态长度必须介于 0 和 1 之间")
+//	@Length(min=0, max=00, message="英文名长度必须介于 0 和 00 之间")
+//	public String getNameEn() {
+//		return nameEn;
+//	}
+//
+//	public void setNameEn(String nameEn) {
+//		this.nameEn = nameEn;
+//	}
+//
+//	@Length(min=0, max=200, message="网址长度必须介于 0 和 200 之间")
+//	public String getSite() {
+//		return site;
+//	}
+//
+//	public void setSite(String site) {
+//		this.site = site;
+//	}
+//
+//	@Length(min=0, max=200, message="头像长度必须介于 0 和 200 之间")
+//	public String getLogo() {
+//		return logo;
+//	}
+//
+//	public void setLogo(String logo) {
+//		this.logo = logo;
+//	}
+//
+//	@Length(min=0, max=255, message="半身照长度必须介于 0 和 255 之间")
+//	public String getHalfBodyImage() {
+//		return halfBodyImage;
+//	}
+//
+//	public void setHalfBodyImage(String halfBodyImage) {
+//		this.halfBodyImage = halfBodyImage;
+//	}
+//
+//	@Length(min=0, max=20, message="法人代表长度必须介于 0 和 20 之间")
+//	public String getLegalPerson() {
+//		return legalPerson;
+//	}
+//
+//	public void setLegalPerson(String legalPerson) {
+//		this.legalPerson = legalPerson;
+//	}
+//
+//	public Integer getTownID() {
+//		return townID;
+//	}
+//
+//	public void setTownID(Integer townID) {
+//		this.townID = townID;
+//	}
+//
+//	@Length(min=0, max=00, message="地址长度必须介于 0 和 00 之间")
+//	public String getAddress() {
+//		return address;
+//	}
+//
+//	public void setAddress(String address) {
+//		this.address = address;
+//	}
+//
+//	@Length(min=0, max=50, message="联系电话长度必须介于 0 和 50 之间")
+//	public String getContractPhone() {
+//		return contractPhone;
+//	}
+//
+//	public void setContractPhone(String contractPhone) {
+//		this.contractPhone = contractPhone;
+//	}
+//
+//	@Length(min=0, max=20, message="联系手机长度必须介于 0 和 20 之间")
+//	public String getContractMobile() {
+//		return contractMobile;
+//	}
+//
+//	public void setContractMobile(String contractMobile) {
+//		this.contractMobile = contractMobile;
+//	}
+//
+//	@Length(min=0, max=50, message="fax长度必须介于 0 和 50 之间")
+//	public String getFax() {
+//		return fax;
+//	}
+//
+//	public void setFax(String fax) {
+//		this.fax = fax;
+//	}
+//
+//	@Length(min=0, max=0, message="邮编长度必须介于 0 和 0 之间")
+//	public String getZipCode() {
+//		return zipCode;
+//	}
+//
+//	public void setZipCode(String zipCode) {
+//		this.zipCode = zipCode;
+//	}
+//
+//	public String getRegisteredCapital() {
+//		return registeredCapital;
+//	}
+//
+//	public void setRegisteredCapital(String registeredCapital) {
+//		this.registeredCapital = registeredCapital;
+//	}
+//
+//	public String getTurnover() {
+//		return turnover;
+//	}
+//
+//	public void setTurnover(String turnover) {
+//		this.turnover = turnover;
+//	}
+//
+//	@Length(min=0, max=1, message="团队人数长度必须介于 0 和  之间")
+//	public String getCount() {
+//		return count;
+//	}
+//
+//	public void setCount(String count) {
+//		this.count = count;
+//	}
+//
+//	@Length(min=0, max=1, message="count2长度必须介于 0 和  之间")
+//	public String getCount2() {
+//		return count2;
+//	}
+//
+//	public void setCount2(String count2) {
+//		this.count2 = count2;
+//	}
+
+	@Length(min=0, max=50, message="联系人（默认联系人）长度必须介于 0 和 50 之间")
+	public String getLinkMan() {
+		return linkMan;
+	}
+
+	public void setLinkMan(String linkMan) {
+		this.linkMan = linkMan;
+	}
+
+	@Length(min=0, max=50, message="联系人职务长度必须介于 0 和 50 之间")
+	public String getDuty() {
+		return duty;
+	}
+
+	public void setDuty(String duty) {
+		this.duty = duty;
+	}
+
+//	@Length(min=0, max=50, message="联系人固定电话长度必须介于 0 和 50 之间")
+//	public String getContractPhone() {
+//		return contractPhone;
+//	}
+//
+//	public void setContractPhone(String contractPhone) {
+//		this.contractPhone = contractPhone;
+//	}
+//
+//	@Length(min=0, max=20, message="联系人手机长度必须介于 0 和 20 之间")
+//	public String getContractMobile() {
+//		return contractMobile;
+//	}
+//
+//	public void setContractMobile(String contractMobile) {
+//		this.contractMobile = contractMobile;
+//	}
+//
+//	@Length(min=0, max=20, message="联系人QQ长度必须介于 0 和 20 之间")
+//	public String getContractQQ() {
+//		return contractQQ;
+//	}
+//
+//	public void setContractQQ(String contractQQ) {
+//		this.contractQQ = contractQQ;
+//	}
+//
+//	@Length(min=0, max=50, message="联系人微信长度必须介于 0 和 50 之间")
+//	public String getWechat() {
+//		return wechat;
+//	}
+//
+//	public void setWechat(String wechat) {
+//		this.wechat = wechat;
+//	}
+
+	@Length(min=0, max=50, message="联系人邮箱长度必须介于 0 和 50 之间")
+	public String getContractEmail() {
+		return contractEmail;
+	}
+
+	public void setContractEmail(String contractEmail) {
+		this.contractEmail = contractEmail;
+	}
+
+//	@Length(min=0, max=50, message="联系人2长度必须介于 0 和 50 之间")
+//	public String getLinkMan2() {
+//		return linkMan2;
+//	}
+//
+//	public void setLinkMan2(String linkMan2) {
+//		this.linkMan2 = linkMan2;
+//	}
+//
+//	@Length(min=0, max=50, message="联系人2职务长度必须介于 0 和 50 之间")
+//	public String getDuty2() {
+//		return duty2;
+//	}
+//
+//	public void setDuty2(String duty2) {
+//		this.duty2 = duty2;
+//	}
+//
+//	@Length(min=0, max=50, message="联系人2固定电话长度必须介于 0 和 50 之间")
+//	public String getContractPhone2() {
+//		return contractPhone2;
+//	}
+//
+//	public void setContractPhone2(String contractPhone2) {
+//		this.contractPhone2 = contractPhone2;
+//	}
+//
+//	@Length(min=0, max=20, message="联系人2手机长度必须介于 0 和 20 之间")
+//	public String getContractMobile2() {
+//		return contractMobile2;
+//	}
+//
+//	public void setContractMobile2(String contractMobile2) {
+//		this.contractMobile2 = contractMobile2;
+//	}
+//
+//	@Length(min=0, max=20, message="联系人2QQ长度必须介于 0 和 20 之间")
+//	public String getContractQQ2() {
+//		return contractQQ2;
+//	}
+//
+//	public void setContractQQ2(String contractQQ2) {
+//		this.contractQQ2 = contractQQ2;
+//	}
+//
+//	@Length(min=0, max=50, message="联系人2微信长度必须介于 0 和 50 之间")
+//	public String getWechat2() {
+//		return wechat2;
+//	}
+//
+//	public void setWechat2(String wechat2) {
+//		this.wechat2 = wechat2;
+//	}
+//
+//	@Length(min=0, max=50, message="联系人2邮箱长度必须介于 0 和 50 之间")
+//	public String getContractEmail2() {
+//		return contractEmail2;
+//	}
+//
+//	public void setContractEmail2(String contractEmail2) {
+//		this.contractEmail2 = contractEmail2;
+//	}
+//
+//	@Length(min=0, max=500, message="团队介绍长度必须介于 0 和 500 之间")
+//	public String getInfo() {
+//		return info;
+//	}
+//
+//	public void setInfo(String info) {
+//		this.info = info;
+//	}
+//
+//	public Double getCommissionRate() {
+//		return commissionRate;
+//	}
+//
+//	public void setCommissionRate(Double commissionRate) {
+//		this.commissionRate = commissionRate;
+//	}
+//
+//	@Length(min=0, max=300, message="服务区域Id长度必须介于 0 和 300 之间")
+//	public String getProvinceIDs() {
+//		return provinceIDs;
+//	}
+//
+//	public void setProvinceIDs(String provinceIDs) {
+//		this.provinceIDs = provinceIDs;
+//	}
+//
+//	@Length(min=0, max=300, message="服务区域名称长度必须介于 0 和 300 之间")
+//	public String getProvinceNames() {
+//		return provinceNames;
+//	}
+//
+//	public void setProvinceNames(String provinceNames) {
+//		this.provinceNames = provinceNames;
+//	}
+//
+//	public Integer getLevel() {
+//		return level;
+//	}
+//
+//	public void setLevel(Integer level) {
+//		this.level = level;
+//	}
+//
+//	@Length(min=0, max=1, message="payFlag长度必须介于 0 和  之间")
+//	public String getPayFlag() {
+//		return payFlag;
+//	}
+//
+//	public void setPayFlag(String payFlag) {
+//		this.payFlag = payFlag;
+//	}
+//
+//	@Length(min=0, max=200, message="营业执照长度必须介于 0 和 200 之间")
+//	public String getBusinessLicenseImage() {
+//		return businessLicenseImage;
+//	}
+//
+//	public void setBusinessLicenseImage(String businessLicenseImage) {
+//		this.businessLicenseImage = businessLicenseImage;
+//	}
+//
+//	@Length(min=0, max=200, message="税务登记证长度必须介于 0 和 200 之间")
+//	public String getTaxCertificateImage() {
+//		return taxCertificateImage;
+//	}
+//
+//	public void setTaxCertificateImage(String taxCertificateImage) {
+//		this.taxCertificateImage = taxCertificateImage;
+//	}
+
+	@Length(min=0, max=1, message="审核状态长度必须介于 0 和  之间")
 	public String getAuditStatus() {
 		return auditStatus;
 	}
@@ -446,7 +454,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.auditStatus = auditStatus;
 	}
 
-	@Length(min=0, max=19, message="审核时间长度必须介于 0 和 19 之间")
+	@Length(min=0, max=9, message="审核时间长度必须介于 0 和 9 之间")
 	public String getAuditTime() {
 		return auditTime;
 	}
@@ -455,7 +463,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.auditTime = auditTime;
 	}
 
-	@Length(min=0, max=100, message="审核信息长度必须介于 0 和 100 之间")
+	@Length(min=0, max=00, message="审核信息长度必须介于 0 和 00 之间")
 	public String getAuditNote() {
 		return auditNote;
 	}
@@ -464,7 +472,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.auditNote = auditNote;
 	}
 
-	@Length(min=0, max=1, message="是否可用 1可用长度必须介于 0 和 1 之间")
+	@Length(min=0, max=1, message="是否可用 可用长度必须介于 0 和  之间")
 	public String getValidFlag() {
 		return validFlag;
 	}
@@ -481,7 +489,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.status = status;
 	}
 
-	@Length(min=0, max=19, message="创建时间长度必须介于 0 和 19 之间")
+	@Length(min=0, max=9, message="创建时间长度必须介于 0 和 9 之间")
 	public String getAddTime() {
 		return addTime;
 	}
@@ -490,21 +498,21 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.addTime = addTime;
 	}
 
-	public Integer getServiceLevelID() {
-		return serviceLevelID;
-	}
-
-	public void setServiceLevelID(Integer serviceLevelID) {
-		this.serviceLevelID = serviceLevelID;
-	}
-
-	public Integer getTypeID() {
-		return typeID;
-	}
-
-	public void setTypeID(Integer typeID) {
-		this.typeID = typeID;
-	}
+//	public Integer getServiceLevelID() {
+//		return serviceLevelID;
+//	}
+//
+//	public void setServiceLevelID(Integer serviceLevelID) {
+//		this.serviceLevelID = serviceLevelID;
+//	}
+//
+//	public Integer getTypeID() {
+//		return typeID;
+//	}
+//
+//	public void setTypeID(Integer typeID) {
+//		this.typeID = typeID;
+//	}
 
 	public Integer getMainServiceProviderID() {
 		return mainServiceProviderID;
@@ -540,7 +548,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.cashDeposit = cashDeposit;
 	}
 
-	@Length(min=0, max=11, message="experience长度必须介于 0 和 11 之间")
+	@Length(min=0, max=1, message="experience长度必须介于 0 和  之间")
 	public String getExperience() {
 		return experience;
 	}
@@ -567,7 +575,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 		this.topPerformance = topPerformance;
 	}
 
-	@Length(min=0, max=1000, message="服务案例长度必须介于 0 和 1000 之间")
+	@Length(min=0, max=000, message="服务案例长度必须介于 0 和 000 之间")
 	public String getServiceCase() {
 		return serviceCase;
 	}
@@ -600,4 +608,22 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 	public void setPosition(String position) {
 		this.position = position;
 	}
+
+	@Length(min=0, max=50, message="电话长度必须介于 0 和 50 之间")
+	public String getContractPhone() {
+		return contractPhone;
+	}
+
+	public void setContractPhone(String contractPhone) {
+		this.contractPhone = contractPhone;
+	}
+
+	@Length(min=0, max=50, message="电话长度必须介于 0 和 50 之间")
+	public String getContractMobile() {
+		return contractMobile;
+	}
+
+	public void setContractMobile(String contractMobile) {
+		this.contractMobile = contractMobile;
+	}
 }

src/main/java/com/caimei/modules/user/web/CmSpController.java

@@ -217,14 +217,13 @@ public class CmSpController extends BaseController {
         }
         NewCmSp cmSp = new NewCmSp();
         CmUser cmUser = new CmUser();
-        cmSp.setLinkMan1(linkMan);
+        cmSp.setLinkMan(linkMan);
         cmSp.setContractMobile(mobile);
-        cmSp.setContractMobile1(mobile);
         if ("1".equals(duty)) {
-            cmSp.setDuty1(UserType.SERVICEPROVIDER.getDesc());
+            cmSp.setDuty(UserType.SERVICEPROVIDER.getDesc());
             cmUser.setRegisterUserTypeID(UserType.SERVICEEMPLOYEE.getCode() + "");
         } else {
-            cmSp.setDuty1(UserType.SERVICEEMPLOYEE.getDesc());
+            cmSp.setDuty(UserType.SERVICEEMPLOYEE.getDesc());
             cmUser.setRegisterUserTypeID(UserType.SERVICEEMPLOYEE.getCode() + "");
         }
         cmSp.setStatus(ServiceProviderStatus.WAIT_CHECK_DATA.getCode());

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -256,14 +256,13 @@ public class SpController extends BaseController {
         }
         NewCmSp cmSp = new NewCmSp();
         CmUser cmUser = new CmUser();
-        cmSp.setLinkMan1(linkMan);
+        cmSp.setLinkMan(linkMan);
         cmSp.setContractMobile(mobile);
-        cmSp.setContractMobile1(mobile);
         if ("1".equals(duty)) {
-            cmSp.setDuty1(com.caimei.constants.UserType.SERVICEPROVIDER.getDesc());
+            cmSp.setDuty(com.caimei.constants.UserType.SERVICEPROVIDER.getDesc());
             cmUser.setRegisterUserTypeID(com.caimei.constants.UserType.SERVICEEMPLOYEE.getCode() + "");
         } else {
-            cmSp.setDuty1(com.caimei.constants.UserType.SERVICEEMPLOYEE.getDesc());
+            cmSp.setDuty(com.caimei.constants.UserType.SERVICEEMPLOYEE.getDesc());
             cmUser.setRegisterUserTypeID(UserType.SERVICEEMPLOYEE.getCode() + "");
         }
         cmSp.setStatus(ServiceProviderStatus.ONLINE.getCode());
@@ -418,18 +417,4 @@ public class SpController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/new/user/cmSp/cmSpList/?repage";
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }

src/main/resources/mappings/modules/user/CmSpMapper.xml

@@ -6,59 +6,18 @@
 		a.serviceProviderID AS "serviceProviderID",
 		a.userID AS "userID",
 		a.name AS "name",
-		a.nameEn AS "nameEn",
-		a.site AS "site",
-		a.logo AS "logo",
-		a.halfBodyImage AS "halfBodyImage",
-		a.legalPerson AS "legalPerson",
-		a.townID AS "townID",
-		a.address AS "address",
-		a.contractPhone AS "contractPhone",
+		a.linkMan AS "linkMan",
 		a.contractMobile AS "contractMobile",
-		a.fax AS "fax",
-		a.zipCode AS "zipCode",
-		a.registeredCapital AS "registeredCapital",
-		a.turnover AS "turnover",
-		a.count1 AS "count1",
-		a.count2 AS "count2",
-		a.linkMan1 AS "linkMan1",
-		a.duty1 AS "duty1",
-		a.contractPhone1 AS "contractPhone1",
-		a.contractMobile1 AS "contractMobile1",
-		a.contractQQ1 AS "contractQQ1",
-		a.wechat1 AS "wechat1",
-		a.contractEmail1 AS "contractEmail1",
-		a.linkMan2 AS "linkMan2",
-		a.duty2 AS "duty2",
-		a.contractPhone2 AS "contractPhone2",
-		a.contractMobile2 AS "contractMobile2",
-		a.contractQQ2 AS "contractQQ2",
-		a.wechat2 AS "wechat2",
-		a.contractEmail2 AS "contractEmail2",
-		a.info AS "info",
-		a.commissionRate AS "commissionRate",
-		a.provinceIDs AS "provinceIDs",
-		a.provinceNames AS "provinceNames",
-		a.level AS "level",
-		a.payFlag1 AS "payFlag1",
-		a.businessLicenseImage AS "businessLicenseImage",
-		a.taxCertificateImage AS "taxCertificateImage",
+		a.contractPhone AS "contractPhone",
+		a.contractEmail AS "contractEmail",
+		a.duty AS "duty",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
 		a.validFlag AS "validFlag",
 		a.status AS "status",
 		a.addTime AS "addTime",
-		a.serviceLevelID AS "serviceLevelID",
-		a.typeID AS "typeID",
-		a.mainServiceProviderID AS "mainServiceProviderID",
-		a.businessScope AS "businessScope",
-		a.companyImage AS "companyImage",
-		a.cashDeposit AS "cashDeposit",
-		a.experience AS "experience",
-		a.serviceItem AS "serviceItem",
-		a.topPerformance AS "topPerformance",
-		a.serviceCase AS "serviceCase"
+		a.mainServiceProviderID AS "mainServiceProviderID"
 	</sql>
 
 	<sql id="newCmSpJoins">
@@ -142,115 +101,33 @@
 		INSERT INTO serviceprovider(
 		userID,
 		name,
-		nameEn,
-		site,
-		logo,
-		halfBodyImage,
-		legalPerson,
-		townID,
-		address,
 		contractPhone,
 		contractMobile,
-		fax,
-		zipCode,
-		registeredCapital,
-		turnover,
-		count1,
-		count2,
-		linkMan1,
-		duty1,
-		contractPhone1,
-		contractMobile1,
-		contractQQ1,
-		wechat1,
-		contractEmail1,
-		linkMan2,
-		duty2,
-		contractPhone2,
-		contractMobile2,
-		contractQQ2,
-		wechat2,
-		contractEmail2,
-		info,
-		commissionRate,
-		provinceIDs,
-		provinceNames,
-		level,
-		payFlag1,
-		businessLicenseImage,
-		taxCertificateImage,
+		duty,
+		contractEmail,
+		linkMan,
 		auditStatus,
 		auditTime,
 		auditNote,
 		validFlag,
 		status,
 		addTime,
-		serviceLevelID,
-		typeID,
-		mainServiceProviderID,
-		businessScope,
-		companyImage,
-		cashDeposit,
-		experience,
-		serviceItem,
-		topPerformance,
-		serviceCase
+		mainServiceProviderID
 		) VALUES (
 		#{userID},
 		#{name},
-		#{nameEn},
-		#{site},
-		#{logo},
-		#{halfBodyImage},
-		#{legalPerson},
-		#{townID},
-		#{address},
 		#{contractPhone},
 		#{contractMobile},
-		#{fax},
-		#{zipCode},
-		#{registeredCapital},
-		#{turnover},
-		#{count1},
-		#{count2},
-		#{linkMan1},
-		#{duty1},
-		#{contractPhone1},
-		#{contractMobile1},
-		#{contractQQ1},
-		#{wechat1},
-		#{contractEmail1},
-		#{linkMan2},
-		#{duty2},
-		#{contractPhone2},
-		#{contractMobile2},
-		#{contractQQ2},
-		#{wechat2},
-		#{contractEmail2},
-		#{info},
-		#{commissionRate},
-		#{provinceIDs},
-		#{provinceNames},
-		#{level},
-		#{payFlag1},
-		#{businessLicenseImage},
-		#{taxCertificateImage},
+		#{duty},
+		#{contractEmail},
+		#{linkMan},
 		#{auditStatus},
 		#{auditTime},
 		#{auditNote},
 		#{validFlag},
 		#{status},
 		#{addTime},
-		#{serviceLevelID},
-		#{typeID},
-		#{mainServiceProviderID},
-		#{businessScope},
-		#{companyImage},
-		#{cashDeposit},
-		#{experience},
-		#{serviceItem},
-		#{topPerformance},
-		#{serviceCase}
+		#{mainServiceProviderID}
 		)
 	</insert>
 
@@ -258,59 +135,18 @@
 		UPDATE serviceprovider SET
 		userID = #{userID},
 		name = #{name},
-		nameEn = #{nameEn},
-		site = #{site},
-		logo = #{logo},
-		halfBodyImage = #{halfBodyImage},
-		legalPerson = #{legalPerson},
-		townID = #{townID},
-		address = #{address},
 		contractPhone = #{contractPhone},
 		contractMobile = #{contractMobile},
-		fax = #{fax},
-		zipCode = #{zipCode},
-		registeredCapital = #{registeredCapital},
-		turnover = #{turnover},
-		count1 = #{count1},
-		count2 = #{count2},
-		linkMan1 = #{linkMan1},
-		duty1 = #{duty1},
-		contractPhone1 = #{contractPhone1},
-		contractMobile1 = #{contractMobile1},
-		contractQQ1 = #{contractQQ1},
-		wechat1 = #{wechat1},
-		contractEmail1 = #{contractEmail1},
-		linkMan2 = #{linkMan2},
-		duty2 = #{duty2},
-		contractPhone2 = #{contractPhone2},
-		contractMobile2 = #{contractMobile2},
-		contractQQ2 = #{contractQQ2},
-		wechat2 = #{wechat2},
-		contractEmail2 = #{contractEmail2},
-		info = #{info},
-		commissionRate = #{commissionRate},
-		provinceIDs = #{provinceIDs},
-		provinceNames = #{provinceNames},
-		level = #{level},
-		payFlag1 = #{payFlag1},
-		businessLicenseImage = #{businessLicenseImage},
-		taxCertificateImage = #{taxCertificateImage},
+		contractEmail = #{contractEmail},
+		linkMan = #{linkMan},
+		duty = #{duty},
 		auditStatus = #{auditStatus},
 		auditTime = #{auditTime},
 		auditNote = #{auditNote},
 		validFlag = #{validFlag},
 		status = #{status},
 		addTime = #{addTime},
-		serviceLevelID = #{serviceLevelID},
-		typeID = #{typeID},
-		mainServiceProviderID = #{mainServiceProviderID},
-		businessScope = #{businessScope},
-		companyImage = #{companyImage},
-		cashDeposit = #{cashDeposit},
-		experience = #{experience},
-		serviceItem = #{serviceItem},
-		topPerformance = #{topPerformance},
-		serviceCase = #{serviceCase}
+		mainServiceProviderID = #{mainServiceProviderID}
 		WHERE serviceProviderID = #{serviceProviderID}
 	</update>