From 651f8e426aa57ec5ebcdfddf840a21449dff4269 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 20 二月 2023 18:06:43 +0800 Subject: [PATCH] 代理商管理,司机管理部分 --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 865 +++++++++++++-------------------------------------------- 1 files changed, 198 insertions(+), 667 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java index 211bdef..635f7bc 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java @@ -1,8 +1,6 @@ package com.stylefeng.guns.modular.system.model; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.enums.IdType; - import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; @@ -12,27 +10,34 @@ /** * <p> - * 司机表 + * 司机基础信息 * </p> * - * @author 吕雪 - * @since 2020-06-04 + * @author stylefeng + * @since 2023-02-20 */ @TableName("t_driver") public class TDriver extends Model<TDriver> { private static final long serialVersionUID = 1L; + /** + * 主键 + */ @TableId(value = "id", type = IdType.AUTO) private Integer id; /** - * 登录账号 + * 编号 */ - private String account; + private String code; /** - * 工号 + * 姓名 */ - private String jobNumber; + private String name; + /** + * 头像 + */ + private String avatar; /** * 手机号 */ @@ -42,173 +47,13 @@ */ private String password; /** - * 姓名 - */ - private String name; - /** - * 性别(1=男,2=女) + * 性别(1=男,2=女) */ private Integer sex; /** - * 身份证号 + * 来源(1=) */ - private String idCard; - /** - * 公司id - */ - private Integer companyId; - /** - * 加盟商ID - */ - private Integer franchiseeId; - /** - * 头像照片 - */ - private String headImgUrl; - /** - * 人脸识别照片 - */ - private String faceImgUrl; - /** - * 身份证正面照片 - */ - private String idCardImgUrl1; - /** - * 身份证背面照片 - */ - private String idCardImgUrl2; - /** - * 网约车司机注册地行政区域 - */ - private String placeOfEmployment; - /** - * 生日 - */ - private Date birthday; - /** - * 银行卡号 - */ - private String bankCardNumber; - /** - * 国籍 - */ - private String driverNationality; - /** - * 民族 - */ - private String driverNation; - /** - * 婚姻状况(1:未婚,2:已婚,3:离异) - */ - private Integer driverMaritalStatus; - /** - * 外语能力 - */ - private String driverLanguageLevel; - /** - * 学历 - */ - private String driverEducation; - /** - * 户口登记机关名称 - */ - private String driverCensus; - /** - * 户口地址或常住地址 - */ - private String driverAddress; - /** - * 通信地址 - */ - private String driverContactAddress; - /** - * 驾龄 - */ - private Integer driverAge; - /** - * 驾驶证号 - */ - private String driveCard; - /** - * 驾驶证照片 - */ - private String driveCardImgUrl; - /** - * 准驾车型 - */ - private String driverType; - /** - * 初次领取驾驶证日期 - */ - private Date getDriverLicenseDate; - /** - * 驾驶证有效期限起 - */ - private Date driverLicenseOn; - /** - * 驾驶证有效期限止 - */ - private Date driverLicenseOff; - /** - * 是否巡游出租车驾驶员(0:否,1:是) - */ - private Integer taxiDriver; - /** - * 出租车资格证号 - */ - private String taxiAptitudeCard; - /** - * 网约车资格证照片 - */ - private String networkCarlssueImg; - /** - * 网络预约出租车驾驶员证发证机构 - */ - private String networkCarlssueOrganization; - /** - * 资格证发证日期 - */ - private Date networkCarlssueDate; - /** - * 初次认领资格证日期 - */ - private Date getNetworkCarProofDate; - /** - * 资格证有效起始日期 - */ - private Date networkCarProofOn; - /** - * 资格证有效截至日期 - */ - private Date networkCarProofOff; - /** - * 报备日期 - */ - private Date registerDate; - /** - * 是否专职驾驶员(0:否,1:是) - */ - private Integer fullTimeDriver; - /** - * 是否在驾驶员黑名单内(0:否,1:是) - */ - private Integer inDriverBlacklist; - /** - * 服务类型(1:网络预约出租汽车,2:巡游出租汽车,3:私人小客车合乘) - */ - private Integer commercialType; - /** - * 驾驶员合同签署公司 - */ - private String contractCompany; - /** - * 合同有效期起 - */ - private Date contractOn; - /** - * 合同有效期止 - */ - private Date contractOff; + private Integer source; /** * 紧急联系人 */ @@ -216,90 +61,80 @@ /** * 紧急联系电话 */ - private String emergencyContactPhone; + private String emergencyPhone; /** - * 紧急联系地址 + * 驾驶证号码 */ - private String emergencyContactAddress; + private String driverLicenseNumber; /** - * 备注 + * 驾驶证照片 */ - private String remark; + private String driverLicense; /** - * 是否是平台车辆(1=是,2=否) + * 身份证号码 */ - private Integer isPlatCar; + private String idcard; /** - * 司机管理车辆id + * 身份证正面照 */ - private Integer carId; + private String idcardFront; /** - * 状态(1=待审核,2=正常,3=冻结,4=拒绝) + * 身份证背面照 */ - private Integer authState; + private String idcardBack; /** - * 司机状态(1=离线,2=空闲,3=服务中) + * 邀约人类型(1=用户,2=司机) */ - private Integer state; + private Integer inviterType; /** - * 1:创建,2:修改,3:删除 + * 邀约人id */ - private String flag; + private Integer inviterId; /** - * 添加时间 + * 代理商id */ - private Date insertTime; - private Integer insertUser; - private Date updateTime; - private Integer updateUser; + private Integer agentId; /** - * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加 + * 分公司id */ - private Integer addType; + private Integer branchOfficeId; /** - * 余额 + * 账户余额 */ private BigDecimal balance; /** - * 业务总收入 - * @return + * 审核状态(1=待审核,2=已同意,3=已拒绝) */ - @TableField("businessMoney") - private Double businessMoney; + private Integer approvalStatus; /** - * 剩余未提现业务总收入 - * @return + * 审核注释 */ - @TableField("laveBusinessMoney") - private Double laveBusinessMoney; + private String approvalNotes; /** - * 添加司机的分公司/加盟商ID + * 审核用户id */ - private Integer addObjectId; + private Integer approvalUserId; + /** + * 审核时间 + */ + private Date approvalTime; + /** + * 服务状态(1=空闲,2=服务中) + */ + private Integer serverStatus; + /** + * 剩余积分 + */ + private Integer integral; + /** + * 状态(1=正常,2=冻结,3=删除) + */ + private Integer status; + /** + * 添加时间 + */ + private Date createTime; - public BigDecimal getBalance() { - return balance; - } - - public void setBalance(BigDecimal balance) { - this.balance = balance; - } - - public Integer getAddObjectId() { - return addObjectId; - } - - public void setAddObjectId(Integer addObjectId) { - this.addObjectId = addObjectId; - } - - public Integer getFranchiseeId() { - return franchiseeId; - } - - public void setFranchiseeId(Integer franchiseeId) { - this.franchiseeId = franchiseeId; - } public Integer getId() { return id; @@ -309,20 +144,28 @@ this.id = id; } - public String getAccount() { - return account; + public String getCode() { + return code; } - public void setAccount(String account) { - this.account = account; + public void setCode(String code) { + this.code = code; } - public String getJobNumber() { - return jobNumber; + public String getName() { + return name; } - public void setJobNumber(String jobNumber) { - this.jobNumber = jobNumber; + public void setName(String name) { + this.name = name; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; } public String getPhone() { @@ -341,14 +184,6 @@ this.password = password; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - public Integer getSex() { return sex; } @@ -357,316 +192,12 @@ this.sex = sex; } - public String getIdCard() { - return idCard; + public Integer getSource() { + return source; } - public void setIdCard(String idCard) { - this.idCard = idCard; - } - - public Integer getCompanyId() { - return companyId; - } - - public void setCompanyId(Integer companyId) { - this.companyId = companyId; - } - - public String getHeadImgUrl() { - return headImgUrl; - } - - public void setHeadImgUrl(String headImgUrl) { - this.headImgUrl = headImgUrl; - } - - public String getFaceImgUrl() { - return faceImgUrl; - } - - public void setFaceImgUrl(String faceImgUrl) { - this.faceImgUrl = faceImgUrl; - } - - public String getIdCardImgUrl1() { - return idCardImgUrl1; - } - - public void setIdCardImgUrl1(String idCardImgUrl1) { - this.idCardImgUrl1 = idCardImgUrl1; - } - - public String getIdCardImgUrl2() { - return idCardImgUrl2; - } - - public void setIdCardImgUrl2(String idCardImgUrl2) { - this.idCardImgUrl2 = idCardImgUrl2; - } - - public String getPlaceOfEmployment() { - return placeOfEmployment; - } - - public void setPlaceOfEmployment(String placeOfEmployment) { - this.placeOfEmployment = placeOfEmployment; - } - - public Date getBirthday() { - return birthday; - } - - public void setBirthday(Date birthday) { - this.birthday = birthday; - } - - public String getBankCardNumber() { - return bankCardNumber; - } - - public void setBankCardNumber(String bankCardNumber) { - this.bankCardNumber = bankCardNumber; - } - - public String getDriverNationality() { - return driverNationality; - } - - public void setDriverNationality(String driverNationality) { - this.driverNationality = driverNationality; - } - - public String getDriverNation() { - return driverNation; - } - - public void setDriverNation(String driverNation) { - this.driverNation = driverNation; - } - - public Integer getDriverMaritalStatus() { - return driverMaritalStatus; - } - - public void setDriverMaritalStatus(Integer driverMaritalStatus) { - this.driverMaritalStatus = driverMaritalStatus; - } - - public String getDriverLanguageLevel() { - return driverLanguageLevel; - } - - public void setDriverLanguageLevel(String driverLanguageLevel) { - this.driverLanguageLevel = driverLanguageLevel; - } - - public String getDriverEducation() { - return driverEducation; - } - - public void setDriverEducation(String driverEducation) { - this.driverEducation = driverEducation; - } - - public String getDriverCensus() { - return driverCensus; - } - - public void setDriverCensus(String driverCensus) { - this.driverCensus = driverCensus; - } - - public String getDriverAddress() { - return driverAddress; - } - - public void setDriverAddress(String driverAddress) { - this.driverAddress = driverAddress; - } - - public String getDriverContactAddress() { - return driverContactAddress; - } - - public void setDriverContactAddress(String driverContactAddress) { - this.driverContactAddress = driverContactAddress; - } - - public Integer getDriverAge() { - return driverAge; - } - - public void setDriverAge(Integer driverAge) { - this.driverAge = driverAge; - } - - public String getDriveCard() { - return driveCard; - } - - public void setDriveCard(String driveCard) { - this.driveCard = driveCard; - } - - public String getDriveCardImgUrl() { - return driveCardImgUrl; - } - - public void setDriveCardImgUrl(String driveCardImgUrl) { - this.driveCardImgUrl = driveCardImgUrl; - } - - public String getDriverType() { - return driverType; - } - - public void setDriverType(String driverType) { - this.driverType = driverType; - } - - public Date getGetDriverLicenseDate() { - return getDriverLicenseDate; - } - - public void setGetDriverLicenseDate(Date getDriverLicenseDate) { - this.getDriverLicenseDate = getDriverLicenseDate; - } - - public Date getDriverLicenseOn() { - return driverLicenseOn; - } - - public void setDriverLicenseOn(Date driverLicenseOn) { - this.driverLicenseOn = driverLicenseOn; - } - - public Date getDriverLicenseOff() { - return driverLicenseOff; - } - - public void setDriverLicenseOff(Date driverLicenseOff) { - this.driverLicenseOff = driverLicenseOff; - } - - public Integer getTaxiDriver() { - return taxiDriver; - } - - public void setTaxiDriver(Integer taxiDriver) { - this.taxiDriver = taxiDriver; - } - - public String getTaxiAptitudeCard() { - return taxiAptitudeCard; - } - - public void setTaxiAptitudeCard(String taxiAptitudeCard) { - this.taxiAptitudeCard = taxiAptitudeCard; - } - - public String getNetworkCarlssueImg() { - return networkCarlssueImg; - } - - public void setNetworkCarlssueImg(String networkCarlssueImg) { - this.networkCarlssueImg = networkCarlssueImg; - } - - public String getNetworkCarlssueOrganization() { - return networkCarlssueOrganization; - } - - public void setNetworkCarlssueOrganization(String networkCarlssueOrganization) { - this.networkCarlssueOrganization = networkCarlssueOrganization; - } - - public Date getNetworkCarlssueDate() { - return networkCarlssueDate; - } - - public void setNetworkCarlssueDate(Date networkCarlssueDate) { - this.networkCarlssueDate = networkCarlssueDate; - } - - public Date getGetNetworkCarProofDate() { - return getNetworkCarProofDate; - } - - public void setGetNetworkCarProofDate(Date getNetworkCarProofDate) { - this.getNetworkCarProofDate = getNetworkCarProofDate; - } - - public Date getNetworkCarProofOn() { - return networkCarProofOn; - } - - public void setNetworkCarProofOn(Date networkCarProofOn) { - this.networkCarProofOn = networkCarProofOn; - } - - public Date getNetworkCarProofOff() { - return networkCarProofOff; - } - - public void setNetworkCarProofOff(Date networkCarProofOff) { - this.networkCarProofOff = networkCarProofOff; - } - - public Date getRegisterDate() { - return registerDate; - } - - public void setRegisterDate(Date registerDate) { - this.registerDate = registerDate; - } - - public Integer getFullTimeDriver() { - return fullTimeDriver; - } - - public void setFullTimeDriver(Integer fullTimeDriver) { - this.fullTimeDriver = fullTimeDriver; - } - - public Integer getInDriverBlacklist() { - return inDriverBlacklist; - } - - public void setInDriverBlacklist(Integer inDriverBlacklist) { - this.inDriverBlacklist = inDriverBlacklist; - } - - public Integer getCommercialType() { - return commercialType; - } - - public void setCommercialType(Integer commercialType) { - this.commercialType = commercialType; - } - - public String getContractCompany() { - return contractCompany; - } - - public void setContractCompany(String contractCompany) { - this.contractCompany = contractCompany; - } - - public Date getContractOn() { - return contractOn; - } - - public void setContractOn(Date contractOn) { - this.contractOn = contractOn; - } - - public Date getContractOff() { - return contractOff; - } - - public void setContractOff(Date contractOff) { - this.contractOff = contractOff; + public void setSource(Integer source) { + this.source = source; } public String getEmergencyContact() { @@ -677,124 +208,156 @@ this.emergencyContact = emergencyContact; } - public String getEmergencyContactPhone() { - return emergencyContactPhone; + public String getEmergencyPhone() { + return emergencyPhone; } - public void setEmergencyContactPhone(String emergencyContactPhone) { - this.emergencyContactPhone = emergencyContactPhone; + public void setEmergencyPhone(String emergencyPhone) { + this.emergencyPhone = emergencyPhone; } - public String getEmergencyContactAddress() { - return emergencyContactAddress; + public String getDriverLicenseNumber() { + return driverLicenseNumber; } - public void setEmergencyContactAddress(String emergencyContactAddress) { - this.emergencyContactAddress = emergencyContactAddress; + public void setDriverLicenseNumber(String driverLicenseNumber) { + this.driverLicenseNumber = driverLicenseNumber; } - public String getRemark() { - return remark; + public String getDriverLicense() { + return driverLicense; } - public void setRemark(String remark) { - this.remark = remark; + public void setDriverLicense(String driverLicense) { + this.driverLicense = driverLicense; } - public Integer getIsPlatCar() { - return isPlatCar; + public String getIdcard() { + return idcard; } - public void setIsPlatCar(Integer isPlatCar) { - this.isPlatCar = isPlatCar; + public void setIdcard(String idcard) { + this.idcard = idcard; } - public Integer getCarId() { - return carId; + public String getIdcardFront() { + return idcardFront; } - public void setCarId(Integer carId) { - this.carId = carId; + public void setIdcardFront(String idcardFront) { + this.idcardFront = idcardFront; } - public Integer getAuthState() { - return authState; + public String getIdcardBack() { + return idcardBack; } - public void setAuthState(Integer authState) { - this.authState = authState; + public void setIdcardBack(String idcardBack) { + this.idcardBack = idcardBack; } - public Integer getState() { - return state; + public Integer getInviterType() { + return inviterType; } - public void setState(Integer state) { - this.state = state; + public void setInviterType(Integer inviterType) { + this.inviterType = inviterType; } - public String getFlag() { - return flag; + public Integer getInviterId() { + return inviterId; } - public void setFlag(String flag) { - this.flag = flag; + public void setInviterId(Integer inviterId) { + this.inviterId = inviterId; } - public Date getInsertTime() { - return insertTime; + public Integer getAgentId() { + return agentId; } - public void setInsertTime(Date insertTime) { - this.insertTime = insertTime; + public void setAgentId(Integer agentId) { + this.agentId = agentId; } - public Integer getInsertUser() { - return insertUser; + public Integer getBranchOfficeId() { + return branchOfficeId; } - public void setInsertUser(Integer insertUser) { - this.insertUser = insertUser; + public void setBranchOfficeId(Integer branchOfficeId) { + this.branchOfficeId = branchOfficeId; } - public Date getUpdateTime() { - return updateTime; + public BigDecimal getBalance() { + return balance; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; + public void setBalance(BigDecimal balance) { + this.balance = balance; } - public Integer getUpdateUser() { - return updateUser; + public Integer getApprovalStatus() { + return approvalStatus; } - public void setUpdateUser(Integer updateUser) { - this.updateUser = updateUser; + public void setApprovalStatus(Integer approvalStatus) { + this.approvalStatus = approvalStatus; } - public Integer getAddType() { - return addType; + public String getApprovalNotes() { + return approvalNotes; } - public void setAddType(Integer addType) { - this.addType = addType; + public void setApprovalNotes(String approvalNotes) { + this.approvalNotes = approvalNotes; } - public Double getLaveBusinessMoney() { - return laveBusinessMoney; + public Integer getApprovalUserId() { + return approvalUserId; } - public void setLaveBusinessMoney(Double laveBusinessMoney) { - this.laveBusinessMoney = laveBusinessMoney; + public void setApprovalUserId(Integer approvalUserId) { + this.approvalUserId = approvalUserId; } - public Double getBusinessMoney() { - return businessMoney; + public Date getApprovalTime() { + return approvalTime; } - public void setBusinessMoney(Double businessMoney) { - this.businessMoney = businessMoney; + public void setApprovalTime(Date approvalTime) { + this.approvalTime = approvalTime; + } + + public Integer getServerStatus() { + return serverStatus; + } + + public void setServerStatus(Integer serverStatus) { + this.serverStatus = serverStatus; + } + + public Integer getIntegral() { + return integral; + } + + public void setIntegral(Integer integral) { + this.integral = integral; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; } @Override @@ -806,65 +369,33 @@ public String toString() { return "TDriver{" + "id=" + id + - ", account=" + account + - ", jobNumber=" + jobNumber + + ", code=" + code + + ", name=" + name + + ", avatar=" + avatar + ", phone=" + phone + ", password=" + password + - ", name=" + name + ", sex=" + sex + - ", idCard=" + idCard + - ", companyId=" + companyId + - ", headImgUrl=" + headImgUrl + - ", faceImgUrl=" + faceImgUrl + - ", idCardImgUrl1=" + idCardImgUrl1 + - ", idCardImgUrl2=" + idCardImgUrl2 + - ", placeOfEmployment=" + placeOfEmployment + - ", birthday=" + birthday + - ", bankCardNumber=" + bankCardNumber + - ", driverNationality=" + driverNationality + - ", driverNation=" + driverNation + - ", driverMaritalStatus=" + driverMaritalStatus + - ", driverLanguageLevel=" + driverLanguageLevel + - ", driverEducation=" + driverEducation + - ", driverCensus=" + driverCensus + - ", driverAddress=" + driverAddress + - ", driverContactAddress=" + driverContactAddress + - ", driverAge=" + driverAge + - ", driveCard=" + driveCard + - ", driveCardImgUrl=" + driveCardImgUrl + - ", driverType=" + driverType + - ", getDriverLicenseDate=" + getDriverLicenseDate + - ", driverLicenseOn=" + driverLicenseOn + - ", driverLicenseOff=" + driverLicenseOff + - ", taxiDriver=" + taxiDriver + - ", taxiAptitudeCard=" + taxiAptitudeCard + - ", networkCarlssueImg=" + networkCarlssueImg + - ", networkCarlssueOrganization=" + networkCarlssueOrganization + - ", networkCarlssueDate=" + networkCarlssueDate + - ", getNetworkCarProofDate=" + getNetworkCarProofDate + - ", networkCarProofOn=" + networkCarProofOn + - ", networkCarProofOff=" + networkCarProofOff + - ", registerDate=" + registerDate + - ", fullTimeDriver=" + fullTimeDriver + - ", inDriverBlacklist=" + inDriverBlacklist + - ", commercialType=" + commercialType + - ", contractCompany=" + contractCompany + - ", contractOn=" + contractOn + - ", contractOff=" + contractOff + + ", source=" + source + ", emergencyContact=" + emergencyContact + - ", emergencyContactPhone=" + emergencyContactPhone + - ", emergencyContactAddress=" + emergencyContactAddress + - ", remark=" + remark + - ", isPlatCar=" + isPlatCar + - ", carId=" + carId + - ", authState=" + authState + - ", state=" + state + - ", flag=" + flag + - ", insertTime=" + insertTime + - ", insertUser=" + insertUser + - ", updateTime=" + updateTime + - ", updateUser=" + updateUser + - ", addType=" + addType + + ", emergencyPhone=" + emergencyPhone + + ", driverLicenseNumber=" + driverLicenseNumber + + ", driverLicense=" + driverLicense + + ", idcard=" + idcard + + ", idcardFront=" + idcardFront + + ", idcardBack=" + idcardBack + + ", inviterType=" + inviterType + + ", inviterId=" + inviterId + + ", agentId=" + agentId + + ", branchOfficeId=" + branchOfficeId + + ", balance=" + balance + + ", approvalStatus=" + approvalStatus + + ", approvalNotes=" + approvalNotes + + ", approvalUserId=" + approvalUserId + + ", approvalTime=" + approvalTime + + ", serverStatus=" + serverStatus + + ", integral=" + integral + + ", status=" + status + + ", createTime=" + createTime + "}"; } } -- Gitblit v1.7.1