From fb0d0d3e2e5bcbc8662f36fb73abd97e9c6483d4 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 12 Aug 2020 12:07:47 +0800 Subject: [PATCH] =?UTF-8?q?CustomerService=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yipin/liuwanr/entity/Customer.java | 444 +++++----- .../java/com/yipin/liuwanr/entity/UserM.java | 769 ++++++++++-------- .../liuwanr/CoursePermissionsServiceTest.java | 3 - .../yipin/liuwanr/CustomerServiceTest.java | 141 ++++ 4 files changed, 847 insertions(+), 510 deletions(-) create mode 100644 src/test/java/com/yipin/liuwanr/CustomerServiceTest.java diff --git a/src/main/java/com/yipin/liuwanr/entity/Customer.java b/src/main/java/com/yipin/liuwanr/entity/Customer.java index e6b2aac..1652068 100644 --- a/src/main/java/com/yipin/liuwanr/entity/Customer.java +++ b/src/main/java/com/yipin/liuwanr/entity/Customer.java @@ -4,189 +4,263 @@ import java.util.List; public class Customer { - //主键ID - private Integer customerId; - //客户名称 - private String customerName; - //国家 - private String countries; - //行业 - private String industry; - //省份 - private Integer provinceId; - //管理员姓名 - private String adminName; - //管理员电话 - private String adminPhone; - //城市 - private Integer cityId; - //客户类型 - private Integer customerType; - //到期时间 - private String stopTime; - //创建时间 - private String creationTime; - //邮件 - private String email; - //绑定学校ID - private Integer schoolId; - //搜索内容 - private String searchContent; - private List customer; - //绑定行业类ID - private Integer industryClassId; - //绑定行业类名称 - private String industryClassName; - //绑定行业ID - private Integer industryId; - //绑定行业名称 - private String industryName; -//———————————————————————— - //绑定省份名称 - private String provinceName; - //绑定城市名称 - private String cityName; - //绑定学校名称 - private String schoolName; - //学校层次 - private Integer level; - - public String getCreationTime() { - return creationTime; - } - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - public String getIndustryClassName() { - return industryClassName; - } - public void setIndustryClassName(String industryClassName) { - this.industryClassName = industryClassName; - } - public String getIndustryName() { - return industryName; - } - public void setIndustryName(String industryName) { - this.industryName = industryName; - } - public Integer getIndustryClassId() { - return industryClassId; - } - public void setIndustryClassId(Integer industryClassId) { - this.industryClassId = industryClassId; - } - public Integer getIndustryId() { - return industryId; - } - public void setIndustryId(Integer industryId) { - this.industryId = industryId; - } - public List getCustomer() { - return customer; - } - public void setCustomer(List customer) { - this.customer = customer; - } - public String getSearchContent() { - return searchContent; - } - public void setSearchContent(String searchContent) { - this.searchContent = searchContent; - } - public Integer getLevel() { - return level; - } - public void setLevel(Integer level) { - this.level = level; - } - public Integer getCustomerId() { - return customerId; - } - public void setCustomerId(Integer customerId) { - this.customerId = customerId; - } - public String getCustomerName() { - return customerName; - } - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - public String getCountries() { - return countries; - } - public void setCountries(String countries) { - this.countries = countries; - } - public String getIndustry() { - return industry; - } - public void setIndustry(String industry) { - this.industry = industry; - } - public Integer getProvinceId() { - return provinceId; - } - public void setProvinceId(Integer provinceId) { - this.provinceId = provinceId; - } - public String getAdminName() { - return adminName; - } - public void setAdminName(String adminName) { - this.adminName = adminName; - } - public String getAdminPhone() { - return adminPhone; - } - public void setAdminPhone(String adminPhone) { - this.adminPhone = adminPhone; - } - public Integer getCityId() { - return cityId; - } - public void setCityId(Integer cityId) { - this.cityId = cityId; - } - public Integer getCustomerType() { - return customerType; - } - public void setCustomerType(Integer customerType) { - this.customerType = customerType; - } - public String getStopTime() { - return stopTime; - } - public void setStopTime(String stopTime) { - this.stopTime = stopTime; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public Integer getSchoolId() { - return schoolId; - } - public void setSchoolId(Integer schoolId) { - this.schoolId = schoolId; - } - public String getProvinceName() { - return provinceName; - } - public void setProvinceName(String provinceName) { - this.provinceName = provinceName; - } - public String getCityName() { - return cityName; - } - public void setCityName(String cityName) { - this.cityName = cityName; - } - public String getSchoolName() { - return schoolName; - } - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } + //主键ID + private Integer customerId; + //客户名称 + private String customerName; + //国家 + private String countries; + //行业 + private String industry; + //省份 + private Integer provinceId; + //管理员姓名 + private String adminName; + //管理员电话 + private String adminPhone; + //城市 + private Integer cityId; + //客户类型 + private Integer customerType; + //到期时间 + private String stopTime; + //创建时间 + private String creationTime; + //邮件 + private String email; + //绑定学校ID + private Integer schoolId; + //搜索内容 + private String searchContent; + private List customer; + //绑定行业类ID + private Integer industryClassId; + //绑定行业类名称 + private String industryClassName; + //绑定行业ID + private Integer industryId; + //绑定行业名称 + private String industryName; + //———————————————————————— + //绑定省份名称 + private String provinceName; + //绑定城市名称 + private String cityName; + //绑定学校名称 + private String schoolName; + //学校层次 + private Integer level; + + public String getCreationTime() { + return creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getIndustryClassName() { + return industryClassName; + } + + public void setIndustryClassName(String industryClassName) { + this.industryClassName = industryClassName; + } + + public String getIndustryName() { + return industryName; + } + + public void setIndustryName(String industryName) { + this.industryName = industryName; + } + + public Integer getIndustryClassId() { + return industryClassId; + } + + public void setIndustryClassId(Integer industryClassId) { + this.industryClassId = industryClassId; + } + + public Integer getIndustryId() { + return industryId; + } + + public void setIndustryId(Integer industryId) { + this.industryId = industryId; + } + + public List getCustomer() { + return customer; + } + + public void setCustomer(List customer) { + this.customer = customer; + } + + public String getSearchContent() { + return searchContent; + } + + public void setSearchContent(String searchContent) { + this.searchContent = searchContent; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public Integer getCustomerId() { + return customerId; + } + + public void setCustomerId(Integer customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCountries() { + return countries; + } + + public void setCountries(String countries) { + this.countries = countries; + } + + public String getIndustry() { + return industry; + } + + public void setIndustry(String industry) { + this.industry = industry; + } + + public Integer getProvinceId() { + return provinceId; + } + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + } + + public String getAdminName() { + return adminName; + } + + public void setAdminName(String adminName) { + this.adminName = adminName; + } + + public String getAdminPhone() { + return adminPhone; + } + + public void setAdminPhone(String adminPhone) { + this.adminPhone = adminPhone; + } + + public Integer getCityId() { + return cityId; + } + + public void setCityId(Integer cityId) { + this.cityId = cityId; + } + + public Integer getCustomerType() { + return customerType; + } + + public void setCustomerType(Integer customerType) { + this.customerType = customerType; + } + + public String getStopTime() { + return stopTime; + } + + public void setStopTime(String stopTime) { + this.stopTime = stopTime; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Integer getSchoolId() { + return schoolId; + } + + public void setSchoolId(Integer schoolId) { + this.schoolId = schoolId; + } + + public String getProvinceName() { + return provinceName; + } + + public void setProvinceName(String provinceName) { + this.provinceName = provinceName; + } + + public String getCityName() { + return cityName; + } + + public void setCityName(String cityName) { + this.cityName = cityName; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + @Override + public String toString() { + return "Customer{" + + "customerId=" + customerId + + ", customerName='" + customerName + '\'' + + ", countries='" + countries + '\'' + + ", industry='" + industry + '\'' + + ", provinceId=" + provinceId + + ", adminName='" + adminName + '\'' + + ", adminPhone='" + adminPhone + '\'' + + ", cityId=" + cityId + + ", customerType=" + customerType + + ", stopTime='" + stopTime + '\'' + + ", creationTime='" + creationTime + '\'' + + ", email='" + email + '\'' + + ", schoolId=" + schoolId + + ", searchContent='" + searchContent + '\'' + + ", customer=" + customer + + ", industryClassId=" + industryClassId + + ", industryClassName='" + industryClassName + '\'' + + ", industryId=" + industryId + + ", industryName='" + industryName + '\'' + + ", provinceName='" + provinceName + '\'' + + ", cityName='" + cityName + '\'' + + ", schoolName='" + schoolName + '\'' + + ", level=" + level + + '}'; + } } diff --git a/src/main/java/com/yipin/liuwanr/entity/UserM.java b/src/main/java/com/yipin/liuwanr/entity/UserM.java index c3e5886..f782890 100644 --- a/src/main/java/com/yipin/liuwanr/entity/UserM.java +++ b/src/main/java/com/yipin/liuwanr/entity/UserM.java @@ -4,329 +4,454 @@ import java.util.List; /** * 用户信息实体 - * @author Ning * + * @author Ning */ public class UserM { - //用户id - private Integer userId; - //用户姓名 - private String name; - //用户账号 - private String userAccount; - //用户密码 - private String password; - //国家 - private String countries; - //绑定省份id - private Integer provinceId; - //绑定城市id - private Integer cityId; - //账号角色 - private Integer accountRole; - //创建时间 - private String creationTime; - //登陆次数 - private Integer logInNumber; - //工号、学号 - private String workNumber; - //部门 - private String department; - //班级 - private String classAndGrade; - //上次登陆时间 - private String lastTimeOfLanding; - //性别 - private Integer sex; - //证件类型(1、身份证) - private Integer documentType; - //身份证 - private String IDNumber; - //教育程度(1、研究数及以上) - private Integer educationDegree; - //授课学科(1、金融) - private Integer subjectsTaught; - //电话 - private String phone; - //微信账号 - private String WeChatID; - //授课专业 - private String teachingProfessional; - //出生日期 - private String dateBirth; - //邮箱 - private String email; - //学校id - private Integer schoolId; - //唯一标示性账号 - private String uniqueIdentificationAccount; - //搜索内容 - private String searchContent; - private List user; - //用户头像路径 - private String userAvatars; -//------------------------------------------------ - //学校名称 - private String schoolName; - //省份名称 - private String provinceName; - //城市名称 - private String cityName; - //条件查询月 - private Integer month; - //条件查询结束时间 - private String endTime; - //专业类ID - private Integer professionalClassId; - //专业类名称 - private String professionalClassName; - //学科ID - private Integer disciplineId; - //学科名称 - private String disciplineName; - //专业id - private Integer professionalId; - //专业名称 - private String professionalName; - - public Integer getProfessionalClassId() { - return professionalClassId; - } - public void setProfessionalClassId(Integer professionalClassId) { - this.professionalClassId = professionalClassId; - } - public String getProfessionalClassName() { - return professionalClassName; - } - public void setProfessionalClassName(String professionalClassName) { - this.professionalClassName = professionalClassName; - } - public Integer getDisciplineId() { - return disciplineId; - } - public void setDisciplineId(Integer disciplineId) { - this.disciplineId = disciplineId; - } - public String getDisciplineName() { - return disciplineName; - } - public void setDisciplineName(String disciplineName) { - this.disciplineName = disciplineName; - } - public Integer getProfessionalId() { - return professionalId; - } - public void setProfessionalId(Integer professionalId) { - this.professionalId = professionalId; - } - public String getProfessionalName() { - return professionalName; - } - public void setProfessionalName(String professionalName) { - this.professionalName = professionalName; - } - public String getUserAvatars() { - return userAvatars; - } - public void setUserAvatars(String userAvatars) { - this.userAvatars = userAvatars; - } - public Integer getMonth() { - return month; - } - public void setMonth(Integer month) { - this.month = month; - } - public String getEndTime() { - return endTime; - } - public void setEndTime(String endTime) { - this.endTime = endTime; - } - public String getSearchContent() { - return searchContent; - } - public void setSearchContent(String searchContent) { - this.searchContent = searchContent; - } - public List getUser() { - return user; - } - public void setUser(List user) { - this.user = user; - } - public String getProvinceName() { - return provinceName; - } - public void setProvinceName(String provinceName) { - this.provinceName = provinceName; - } - public String getCityName() { - return cityName; - } - public void setCityName(String cityName) { - this.cityName = cityName; - } - public String getSchoolName() { - return schoolName; - } - public void setSchoolName(String schoolName) { - this.schoolName = schoolName; - } - public String getUniqueIdentificationAccount() { - return uniqueIdentificationAccount; - } - public void setUniqueIdentificationAccount(String uniqueIdentificationAccount) { - this.uniqueIdentificationAccount = uniqueIdentificationAccount; - } - public Integer getUserId() { - return userId; - } - public void setUserId(Integer userId) { - this.userId = userId; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getUserAccount() { - return userAccount; - } - public void setUserAccount(String userAccount) { - this.userAccount = userAccount; - } - public String getPassword() { - return password; - } - public void setPassword(String password) { - this.password = password; - } - public String getCountries() { - return countries; - } - public void setCountries(String countries) { - this.countries = countries; - } - public Integer getProvinceId() { - return provinceId; - } - public void setProvinceId(Integer provinceId) { - this.provinceId = provinceId; - } - public Integer getCityId() { - return cityId; - } - public void setCityId(Integer cityId) { - this.cityId = cityId; - } - public Integer getAccountRole() { - return accountRole; - } - public void setAccountRole(Integer accountRole) { - this.accountRole = accountRole; - } - public String getCreationTime() { - return creationTime; - } - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - public Integer getLogInNumber() { - return logInNumber; - } - public void setLogInNumber(Integer logInNumber) { - this.logInNumber = logInNumber; - } - public String getWorkNumber() { - return workNumber; - } - public void setWorkNumber(String workNumber) { - this.workNumber = workNumber; - } - public String getDepartment() { - return department; - } - public void setDepartment(String department) { - this.department = department; - } - public String getClassAndGrade() { - return classAndGrade; - } - public void setClassAndGrade(String classAndGrade) { - this.classAndGrade = classAndGrade; - } - public String getLastTimeOfLanding() { - return lastTimeOfLanding; - } - public void setLastTimeOfLanding(String lastTimeOfLanding) { - this.lastTimeOfLanding = lastTimeOfLanding; - } - public Integer getSex() { - return sex; - } - public void setSex(Integer sex) { - this.sex = sex; - } - public Integer getDocumentType() { - return documentType; - } - public void setDocumentType(Integer documentType) { - this.documentType = documentType; - } - public String getIDNumber() { - return IDNumber; - } - public void setIDNumber(String iDNumber) { - IDNumber = iDNumber; - } - public Integer getEducationDegree() { - return educationDegree; - } - public void setEducationDegree(Integer educationDegree) { - this.educationDegree = educationDegree; - } - public Integer getSubjectsTaught() { - return subjectsTaught; - } - public void setSubjectsTaught(Integer subjectsTaught) { - this.subjectsTaught = subjectsTaught; - } - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; - } - public String getWeChatID() { - return WeChatID; - } - public void setWeChatID(String weChatID) { - WeChatID = weChatID; - } - public String getTeachingProfessional() { - return teachingProfessional; - } - public void setTeachingProfessional(String teachingProfessional) { - this.teachingProfessional = teachingProfessional; - } - public String getDateBirth() { - return dateBirth; - } - public void setDateBirth(String dateBirth) { - this.dateBirth = dateBirth; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public Integer getSchoolId() { - return schoolId; - } - public void setSchoolId(Integer schoolId) { - this.schoolId = schoolId; - } + //用户id + private Integer userId; + //用户姓名 + private String name; + //用户账号 + private String userAccount; + //用户密码 + private String password; + //国家 + private String countries; + //绑定省份id + private Integer provinceId; + //绑定城市id + private Integer cityId; + //账号角色 + private Integer accountRole; + //创建时间 + private String creationTime; + //登陆次数 + private Integer logInNumber; + //工号、学号 + private String workNumber; + //部门 + private String department; + //班级 + private String classAndGrade; + //上次登陆时间 + private String lastTimeOfLanding; + //性别 + private Integer sex; + //证件类型(1、身份证) + private Integer documentType; + //身份证 + private String IDNumber; + //教育程度(1、研究数及以上) + private Integer educationDegree; + //授课学科(1、金融) + private Integer subjectsTaught; + //电话 + private String phone; + //微信账号 + private String WeChatID; + //授课专业 + private String teachingProfessional; + //出生日期 + private String dateBirth; + //邮箱 + private String email; + //学校id + private Integer schoolId; + //唯一标示性账号 + private String uniqueIdentificationAccount; + //搜索内容 + private String searchContent; + private List user; + //用户头像路径 + private String userAvatars; + //------------------------------------------------ + //学校名称 + private String schoolName; + //省份名称 + private String provinceName; + //城市名称 + private String cityName; + //条件查询月 + private Integer month; + //条件查询结束时间 + private String endTime; + //专业类ID + private Integer professionalClassId; + //专业类名称 + private String professionalClassName; + //学科ID + private Integer disciplineId; + //学科名称 + private String disciplineName; + //专业id + private Integer professionalId; + //专业名称 + private String professionalName; + + public Integer getProfessionalClassId() { + return professionalClassId; + } + + public void setProfessionalClassId(Integer professionalClassId) { + this.professionalClassId = professionalClassId; + } + + public String getProfessionalClassName() { + return professionalClassName; + } + + public void setProfessionalClassName(String professionalClassName) { + this.professionalClassName = professionalClassName; + } + + public Integer getDisciplineId() { + return disciplineId; + } + + public void setDisciplineId(Integer disciplineId) { + this.disciplineId = disciplineId; + } + + public String getDisciplineName() { + return disciplineName; + } + + public void setDisciplineName(String disciplineName) { + this.disciplineName = disciplineName; + } + + public Integer getProfessionalId() { + return professionalId; + } + + public void setProfessionalId(Integer professionalId) { + this.professionalId = professionalId; + } + + public String getProfessionalName() { + return professionalName; + } + + public void setProfessionalName(String professionalName) { + this.professionalName = professionalName; + } + + public String getUserAvatars() { + return userAvatars; + } + + public void setUserAvatars(String userAvatars) { + this.userAvatars = userAvatars; + } + + public Integer getMonth() { + return month; + } + + public void setMonth(Integer month) { + this.month = month; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getSearchContent() { + return searchContent; + } + + public void setSearchContent(String searchContent) { + this.searchContent = searchContent; + } + + public List getUser() { + return user; + } + + public void setUser(List user) { + this.user = user; + } + + public String getProvinceName() { + return provinceName; + } + + public void setProvinceName(String provinceName) { + this.provinceName = provinceName; + } + + public String getCityName() { + return cityName; + } + + public void setCityName(String cityName) { + this.cityName = cityName; + } + + public String getSchoolName() { + return schoolName; + } + + public void setSchoolName(String schoolName) { + this.schoolName = schoolName; + } + + public String getUniqueIdentificationAccount() { + return uniqueIdentificationAccount; + } + + public void setUniqueIdentificationAccount(String uniqueIdentificationAccount) { + this.uniqueIdentificationAccount = uniqueIdentificationAccount; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUserAccount() { + return userAccount; + } + + public void setUserAccount(String userAccount) { + this.userAccount = userAccount; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getCountries() { + return countries; + } + + public void setCountries(String countries) { + this.countries = countries; + } + + public Integer getProvinceId() { + return provinceId; + } + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + } + + public Integer getCityId() { + return cityId; + } + + public void setCityId(Integer cityId) { + this.cityId = cityId; + } + + public Integer getAccountRole() { + return accountRole; + } + + public void setAccountRole(Integer accountRole) { + this.accountRole = accountRole; + } + + public String getCreationTime() { + return creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public Integer getLogInNumber() { + return logInNumber; + } + + public void setLogInNumber(Integer logInNumber) { + this.logInNumber = logInNumber; + } + + public String getWorkNumber() { + return workNumber; + } + + public void setWorkNumber(String workNumber) { + this.workNumber = workNumber; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getClassAndGrade() { + return classAndGrade; + } + + public void setClassAndGrade(String classAndGrade) { + this.classAndGrade = classAndGrade; + } + + public String getLastTimeOfLanding() { + return lastTimeOfLanding; + } + + public void setLastTimeOfLanding(String lastTimeOfLanding) { + this.lastTimeOfLanding = lastTimeOfLanding; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getDocumentType() { + return documentType; + } + + public void setDocumentType(Integer documentType) { + this.documentType = documentType; + } + + public String getIDNumber() { + return IDNumber; + } + + public void setIDNumber(String iDNumber) { + IDNumber = iDNumber; + } + + public Integer getEducationDegree() { + return educationDegree; + } + + public void setEducationDegree(Integer educationDegree) { + this.educationDegree = educationDegree; + } + + public Integer getSubjectsTaught() { + return subjectsTaught; + } + + public void setSubjectsTaught(Integer subjectsTaught) { + this.subjectsTaught = subjectsTaught; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getWeChatID() { + return WeChatID; + } + + public void setWeChatID(String weChatID) { + WeChatID = weChatID; + } + + public String getTeachingProfessional() { + return teachingProfessional; + } + + public void setTeachingProfessional(String teachingProfessional) { + this.teachingProfessional = teachingProfessional; + } + + public String getDateBirth() { + return dateBirth; + } + + public void setDateBirth(String dateBirth) { + this.dateBirth = dateBirth; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Integer getSchoolId() { + return schoolId; + } + + public void setSchoolId(Integer schoolId) { + this.schoolId = schoolId; + } + + @Override + public String toString() { + return "UserM{" + + "userId=" + userId + + ", name='" + name + '\'' + + ", userAccount='" + userAccount + '\'' + + ", password='" + password + '\'' + + ", countries='" + countries + '\'' + + ", provinceId=" + provinceId + + ", cityId=" + cityId + + ", accountRole=" + accountRole + + ", creationTime='" + creationTime + '\'' + + ", logInNumber=" + logInNumber + + ", workNumber='" + workNumber + '\'' + + ", department='" + department + '\'' + + ", classAndGrade='" + classAndGrade + '\'' + + ", lastTimeOfLanding='" + lastTimeOfLanding + '\'' + + ", sex=" + sex + + ", documentType=" + documentType + + ", IDNumber='" + IDNumber + '\'' + + ", educationDegree=" + educationDegree + + ", subjectsTaught=" + subjectsTaught + + ", phone='" + phone + '\'' + + ", WeChatID='" + WeChatID + '\'' + + ", teachingProfessional='" + teachingProfessional + '\'' + + ", dateBirth='" + dateBirth + '\'' + + ", email='" + email + '\'' + + ", schoolId=" + schoolId + + ", uniqueIdentificationAccount='" + uniqueIdentificationAccount + '\'' + + ", searchContent='" + searchContent + '\'' + + ", user=" + user + + ", userAvatars='" + userAvatars + '\'' + + ", schoolName='" + schoolName + '\'' + + ", provinceName='" + provinceName + '\'' + + ", cityName='" + cityName + '\'' + + ", month=" + month + + ", endTime='" + endTime + '\'' + + ", professionalClassId=" + professionalClassId + + ", professionalClassName='" + professionalClassName + '\'' + + ", disciplineId=" + disciplineId + + ", disciplineName='" + disciplineName + '\'' + + ", professionalId=" + professionalId + + ", professionalName='" + professionalName + '\'' + + '}'; + } } diff --git a/src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java b/src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java index 284868e..539243f 100644 --- a/src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java +++ b/src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java @@ -22,9 +22,6 @@ public class CoursePermissionsServiceTest { @Autowired private CoursePermissionsService coursePermissionsService; - @Autowired - private CoursePermissionsMapper coursePermissionsMapper; - /** * 新增课程权限 */ diff --git a/src/test/java/com/yipin/liuwanr/CustomerServiceTest.java b/src/test/java/com/yipin/liuwanr/CustomerServiceTest.java new file mode 100644 index 0000000..28ee8a8 --- /dev/null +++ b/src/test/java/com/yipin/liuwanr/CustomerServiceTest.java @@ -0,0 +1,141 @@ +package com.yipin.liuwanr; + +import com.yipin.liuwanr.entity.Customer; +import com.yipin.liuwanr.entity.UserM; +import com.yipin.liuwanr.service.CustomerService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CustomerServiceTest { + @Autowired + private CustomerService customerService; + + //添加客户 + @Test + @Transactional + public void addCustomer() { + Customer customer = new Customer(); + customer.setCountries("测试"); + customer.setIndustry("测试"); + customer.setProvinceId(1); + customer.setAdminName("测试"); + customer.setAdminPhone("测试"); + customer.setCityId(1); + customer.setCustomerType(1); + customer.setStopTime("测试"); + customer.setEmail("测试"); + customer.setSchoolId(1); + customer.setIndustryClassId(1); + customer.setIndustryId(1); + customer.setCustomerName("测试"); + HashMap map = customerService.addCustomer(customer); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //客户管理添加用户 + @Test + @Transactional + public void addAdmin() { + UserM userm = new UserM(); + userm.setCountries("测试"); + userm.setProvinceId(1); + userm.setCityId(1); + userm.setPhone("13137366429"); + userm.setEmail("123@gmail.com"); + HashMap map = customerService.addAdmin(userm); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + @Test + public void queryCustomer() { + Customer customer = new Customer(); + Integer pageNo = 1; + Integer pageSize = 10; + + HashMap map = customerService.queryCustomer(customer, pageNo, pageSize); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + @Test + public void queryCustomerDetails() { + Integer customerId = 10; + HashMap map = customerService.queryCustomerDetails(customerId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //查询客户是否存在 + @Test + public void queryCustomerIsExists() { + Integer schoolId = 10; + HashMap map = customerService.queryCustomerIsExists(schoolId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //删除客户 + @Test + @Transactional + public void deleteCustomer() { + Customer customer = new Customer(); + customer.setCountries("测试"); + customer.setIndustry("测试"); + customer.setProvinceId(1); + customer.setAdminName("测试"); + customer.setAdminPhone("测试"); + customer.setCityId(1); + customer.setCustomerType(1); + customer.setStopTime("测试"); + customer.setEmail("测试"); + customer.setSchoolId(1); + customer.setIndustryClassId(1); + customer.setIndustryId(1); + customer.setCustomerName("测试"); + HashMap map = customerService.deleteCustomer(customer); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //更新客户 + @Test + @Transactional + public void updateCustomer() { + Customer customer = new Customer(); + customer.setCustomerId(53); + customer.setCountries("测试"); + customer.setIndustry("测试"); + customer.setProvinceId(1); + customer.setAdminName("测试"); + customer.setAdminPhone("测试"); + customer.setCityId(1); + customer.setCustomerType(1); + customer.setStopTime("测试"); + customer.setEmail("测试"); + customer.setSchoolId(1); + customer.setIndustryClassId(1); + customer.setIndustryId(1); + customer.setCustomerName("测试"); + HashMap map = customerService.updateCustomer(customer); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //查询行业类 + @Test + public void queryCustomerIndustryClass() { + HashMap map = customerService.queryCustomerIndustryClass(); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } + + //查询行业 + @Test + public void queryCustomerIndustry() { + Integer industryClassId = 10; + HashMap map = customerService.queryCustomerIndustry(industryClassId); + map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString())); + } +}