Skip to content

A
attendance-performance-platform
Commit 04c44aa9 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改员工管理初始状态

parent da95e82d
Show whitespace changes
Inline Side-by-side
Showing with 417 additions and 1727 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffAdjustLogEntity.java
View file @ 04c44aa9
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffAdjustLogVo; import com.mortals.xhx.module.staff.model.vo.StaffAdjustLogVo;
import lombok.Data;
/** /**
* 员工调岗信息实体对象 * 员工调岗信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffAdjustLogEntity extends StaffAdjustLogVo { public class StaffAdjustLogEntity extends StaffAdjustLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,7 +29,7 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo { ...@@ -26,7 +29,7 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo {
*/ */
private String fullName; private String fullName;
/** /**
* 性别1男2女 * 性别(1.男,2.女)
*/ */
private Integer gender; private Integer gender;
/** /**
...@@ -70,11 +73,11 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo { ...@@ -70,11 +73,11 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo {
*/ */
private String jobName; private String jobName;
/** /**
* 员工类型1全职2兼职3实习 * 员工类型(1.全职,2.兼职,3.实习)
*/ */
private Integer staffType; private Integer staffType;
/** /**
* 员工状态1正式2试用3离职 * 员工状态(1.正式,2.试用,3.离职)
*/ */
private Integer status; private Integer status;
/** /**
...@@ -98,311 +101,9 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo { ...@@ -98,311 +101,9 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo {
*/ */
private String newJobName; private String newJobName;
/** /**
* 审核状态0待审核1通过2拒绝 * 审核状态(0待审核1通过2拒绝)
*/ */
private Integer auditStatus; private Integer auditStatus;
public StaffAdjustLogEntity(){}
/**
* 获取 员工ID
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工ID
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getFullName(){
return fullName;
}
/**
* 设置 员工姓名
* @param fullName
*/
public void setFullName(String fullName){
this.fullName = fullName;
}
/**
* 获取 性别1男2女
* @return Integer
*/
public Integer getGender(){
return gender;
}
/**
* 设置 性别1男2女
* @param gender
*/
public void setGender(Integer gender){
this.gender = gender;
}
/**
* 获取 出生日期
* @return Date
*/
public Date getBirthday(){
return birthday;
}
/**
* 设置 出生日期
* @param birthday
*/
public void setBirthday(Date birthday){
this.birthday = birthday;
}
/**
* 获取 照片
* @return String
*/
public String getPhotoPath(){
return photoPath;
}
/**
* 设置 照片
* @param photoPath
*/
public void setPhotoPath(String photoPath){
this.photoPath = photoPath;
}
/**
* 获取 联系电话
* @return String
*/
public String getPhoneNumber(){
return phoneNumber;
}
/**
* 设置 联系电话
* @param phoneNumber
*/
public void setPhoneNumber(String phoneNumber){
this.phoneNumber = phoneNumber;
}
/**
* 获取 身份证号码
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证号码
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 工号
* @return String
*/
public String getWorkNum(){
return workNum;
}
/**
* 设置 工号
* @param workNum
*/
public void setWorkNum(String workNum){
this.workNum = workNum;
}
/**
* 获取 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @return Integer
*/
public Integer getPoliticalstatus(){
return politicalstatus;
}
/**
* 设置 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @param politicalstatus
*/
public void setPoliticalstatus(Integer politicalstatus){
this.politicalstatus = politicalstatus;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getJobId(){
return jobId;
}
/**
* 设置 职位ID
* @param jobId
*/
public void setJobId(Long jobId){
this.jobId = jobId;
}
/**
* 获取 职位名称
* @return String
*/
public String getJobName(){
return jobName;
}
/**
* 设置 职位名称
* @param jobName
*/
public void setJobName(String jobName){
this.jobName = jobName;
}
/**
* 获取 员工类型1全职2兼职3实习
* @return Integer
*/
public Integer getStaffType(){
return staffType;
}
/**
* 设置 员工类型1全职2兼职3实习
* @param staffType
*/
public void setStaffType(Integer staffType){
this.staffType = staffType;
}
/**
* 获取 员工状态1正式2试用3离职
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 员工状态1正式2试用3离职
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 入职时间
* @return Date
*/
public Date getEntryDate(){
return entryDate;
}
/**
* 设置 入职时间
* @param entryDate
*/
public void setEntryDate(Date entryDate){
this.entryDate = entryDate;
}
/**
* 获取 调岗后所属部门
* @return Long
*/
public Long getNewDeptId(){
return newDeptId;
}
/**
* 设置 调岗后所属部门
* @param newDeptId
*/
public void setNewDeptId(Long newDeptId){
this.newDeptId = newDeptId;
}
/**
* 获取 调岗后所属部门名称
* @return String
*/
public String getNewDeptName(){
return newDeptName;
}
/**
* 设置 调岗后所属部门名称
* @param newDeptName
*/
public void setNewDeptName(String newDeptName){
this.newDeptName = newDeptName;
}
/**
* 获取 调岗后职位ID
* @return Long
*/
public Long getNewJobId(){
return newJobId;
}
/**
* 设置 调岗后职位ID
* @param newJobId
*/
public void setNewJobId(Long newJobId){
this.newJobId = newJobId;
}
/**
* 获取 调岗后职位名称
* @return String
*/
public String getNewJobName(){
return newJobName;
}
/**
* 设置 调岗后职位名称
* @param newJobName
*/
public void setNewJobName(String newJobName){
this.newJobName = newJobName;
}
/**
* 获取 审核状态0待审核1通过2拒绝
* @return Integer
*/
public Integer getAuditStatus(){
return auditStatus;
}
/**
* 设置 审核状态0待审核1通过2拒绝
* @param auditStatus
*/
public void setAuditStatus(Integer auditStatus){
this.auditStatus = auditStatus;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -419,74 +120,27 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo { ...@@ -419,74 +120,27 @@ public class StaffAdjustLogEntity extends StaffAdjustLogVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",fullName:").append(getFullName());
sb.append(",gender:").append(getGender());
sb.append(",birthday:").append(getBirthday());
sb.append(",photoPath:").append(getPhotoPath());
sb.append(",phoneNumber:").append(getPhoneNumber());
sb.append(",idCard:").append(getIdCard());
sb.append(",workNum:").append(getWorkNum());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",jobId:").append(getJobId());
sb.append(",jobName:").append(getJobName());
sb.append(",staffType:").append(getStaffType());
sb.append(",status:").append(getStatus());
sb.append(",entryDate:").append(getEntryDate());
sb.append(",newDeptId:").append(getNewDeptId());
sb.append(",newDeptName:").append(getNewDeptName());
sb.append(",newJobId:").append(getNewJobId());
sb.append(",newJobName:").append(getNewJobName());
sb.append(",auditStatus:").append(getAuditStatus());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L;
this.staffId = null;
this.fullName = ""; this.fullName = "";
this.gender = 1; this.gender = 1;
this.birthday = new Date();
this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = 0L;
this.deptId = null;
this.deptName = ""; this.deptName = "";
this.jobId = 0L;
this.jobId = null;
this.jobName = ""; this.jobName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.entryDate = new Date();
this.entryDate = null; this.newDeptId = 0L;
this.newDeptId = null;
this.newDeptName = ""; this.newDeptName = "";
this.newJobId = 0L;
this.newJobId = null;
this.newJobName = ""; this.newJobName = "";
this.auditStatus = 0; this.auditStatus = 0;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffContractEntity.java
View file @ 04c44aa9
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffContractVo; import com.mortals.xhx.module.staff.model.vo.StaffContractVo;
import lombok.Data;
/** /**
* 员工合同信息实体对象 * 员工合同信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffContractEntity extends StaffContractVo { public class StaffContractEntity extends StaffContractVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -109,336 +112,6 @@ public class StaffContractEntity extends StaffContractVo { ...@@ -109,336 +112,6 @@ public class StaffContractEntity extends StaffContractVo {
* 审核状态(0.待审核,1.通过,2.拒绝) * 审核状态(0.待审核,1.通过,2.拒绝)
*/ */
private Integer auditStatus; private Integer auditStatus;
public StaffContractEntity(){}
/**
* 获取 员工ID
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工ID
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getStaffName(){
return staffName;
}
/**
* 设置 员工姓名
* @param staffName
*/
public void setStaffName(String staffName){
this.staffName = staffName;
}
/**
* 获取 性别(1.男,2.女)
* @return Integer
*/
public Integer getGender(){
return gender;
}
/**
* 设置 性别(1.男,2.女)
* @param gender
*/
public void setGender(Integer gender){
this.gender = gender;
}
/**
* 获取 出生日期
* @return Date
*/
public Date getBirthday(){
return birthday;
}
/**
* 设置 出生日期
* @param birthday
*/
public void setBirthday(Date birthday){
this.birthday = birthday;
}
/**
* 获取 照片
* @return String
*/
public String getPhotoPath(){
return photoPath;
}
/**
* 设置 照片
* @param photoPath
*/
public void setPhotoPath(String photoPath){
this.photoPath = photoPath;
}
/**
* 获取 联系电话
* @return String
*/
public String getPhoneNumber(){
return phoneNumber;
}
/**
* 设置 联系电话
* @param phoneNumber
*/
public void setPhoneNumber(String phoneNumber){
this.phoneNumber = phoneNumber;
}
/**
* 获取 身份证号码
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证号码
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 工号
* @return String
*/
public String getWorkNum(){
return workNum;
}
/**
* 设置 工号
* @param workNum
*/
public void setWorkNum(String workNum){
this.workNum = workNum;
}
/**
* 获取 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @return Integer
*/
public Integer getPoliticalstatus(){
return politicalstatus;
}
/**
* 设置 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @param politicalstatus
*/
public void setPoliticalstatus(Integer politicalstatus){
this.politicalstatus = politicalstatus;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getJobId(){
return jobId;
}
/**
* 设置 职位ID
* @param jobId
*/
public void setJobId(Long jobId){
this.jobId = jobId;
}
/**
* 获取 职位名称
* @return String
*/
public String getJobName(){
return jobName;
}
/**
* 设置 职位名称
* @param jobName
*/
public void setJobName(String jobName){
this.jobName = jobName;
}
/**
* 获取 员工类型(1.全职,2.兼职,3.实习)
* @return Integer
*/
public Integer getStaffType(){
return staffType;
}
/**
* 设置 员工类型(1.全职,2.兼职,3.实习)
* @param staffType
*/
public void setStaffType(Integer staffType){
this.staffType = staffType;
}
/**
* 获取 员工状态(1.正式,2.试用,3.离职)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 员工状态(1.正式,2.试用,3.离职)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 入职时间
* @return Date
*/
public Date getEntryDate(){
return entryDate;
}
/**
* 设置 入职时间
* @param entryDate
*/
public void setEntryDate(Date entryDate){
this.entryDate = entryDate;
}
/**
* 获取 现合同开始时间
* @return Date
*/
public Date getContractStartDate(){
return contractStartDate;
}
/**
* 设置 现合同开始时间
* @param contractStartDate
*/
public void setContractStartDate(Date contractStartDate){
this.contractStartDate = contractStartDate;
}
/**
* 获取 现合同到期时间
* @return Date
*/
public Date getContractEndDate(){
return contractEndDate;
}
/**
* 设置 现合同到期时间
* @param contractEndDate
*/
public void setContractEndDate(Date contractEndDate){
this.contractEndDate = contractEndDate;
}
/**
* 获取 合同公司
* @return String
*/
public String getContractCompany(){
return contractCompany;
}
/**
* 设置 合同公司
* @param contractCompany
*/
public void setContractCompany(String contractCompany){
this.contractCompany = contractCompany;
}
/**
* 获取 合同类型(1.纸质)
* @return Integer
*/
public Integer getContractType(){
return contractType;
}
/**
* 设置 合同类型(1.纸质)
* @param contractType
*/
public void setContractType(Integer contractType){
this.contractType = contractType;
}
/**
* 获取 新合同开始时间
* @return Date
*/
public Date getNewStartDate(){
return newStartDate;
}
/**
* 设置 新合同开始时间
* @param newStartDate
*/
public void setNewStartDate(Date newStartDate){
this.newStartDate = newStartDate;
}
/**
* 获取 新合同到期时间
* @return Date
*/
public Date getNewEndDate(){
return newEndDate;
}
/**
* 设置 新合同到期时间
* @param newEndDate
*/
public void setNewEndDate(Date newEndDate){
this.newEndDate = newEndDate;
}
/**
* 获取 审核状态(0.待审核,1.通过,2.拒绝)
* @return Integer
*/
public Integer getAuditStatus(){
return auditStatus;
}
/**
* 设置 审核状态(0.待审核,1.通过,2.拒绝)
* @param auditStatus
*/
public void setAuditStatus(Integer auditStatus){
this.auditStatus = auditStatus;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -455,80 +128,29 @@ public class StaffContractEntity extends StaffContractVo { ...@@ -455,80 +128,29 @@ public class StaffContractEntity extends StaffContractVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",gender:").append(getGender());
sb.append(",birthday:").append(getBirthday());
sb.append(",photoPath:").append(getPhotoPath());
sb.append(",phoneNumber:").append(getPhoneNumber());
sb.append(",idCard:").append(getIdCard());
sb.append(",workNum:").append(getWorkNum());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",jobId:").append(getJobId());
sb.append(",jobName:").append(getJobName());
sb.append(",staffType:").append(getStaffType());
sb.append(",status:").append(getStatus());
sb.append(",entryDate:").append(getEntryDate());
sb.append(",contractStartDate:").append(getContractStartDate());
sb.append(",contractEndDate:").append(getContractEndDate());
sb.append(",contractCompany:").append(getContractCompany());
sb.append(",contractType:").append(getContractType());
sb.append(",newStartDate:").append(getNewStartDate());
sb.append(",newEndDate:").append(getNewEndDate());
sb.append(",auditStatus:").append(getAuditStatus());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L;
this.staffId = null;
this.staffName = ""; this.staffName = "";
this.gender = 1; this.gender = 1;
this.birthday = new Date();
this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = 0L;
this.deptId = null;
this.deptName = ""; this.deptName = "";
this.jobId = 0L;
this.jobId = null;
this.jobName = ""; this.jobName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.entryDate = new Date();
this.entryDate = null; this.contractStartDate = new Date();
this.contractEndDate = new Date();
this.contractStartDate = null;
this.contractEndDate = null;
this.contractCompany = ""; this.contractCompany = "";
this.contractType = 1; this.contractType = 1;
this.newStartDate = new Date();
this.newStartDate = null; this.newEndDate = new Date();
this.newEndDate = null;
this.auditStatus = 0; this.auditStatus = 0;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffLeaveEntity.java
View file @ 04c44aa9
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffLeaveVo; import com.mortals.xhx.module.staff.model.vo.StaffLeaveVo;
import lombok.Data;
/** /**
* 员工离职信息实体对象 * 员工离职信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffLeaveEntity extends StaffLeaveVo { public class StaffLeaveEntity extends StaffLeaveVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -93,280 +96,6 @@ public class StaffLeaveEntity extends StaffLeaveVo { ...@@ -93,280 +96,6 @@ public class StaffLeaveEntity extends StaffLeaveVo {
* 审核状态(0.待审,1.通过,2.拒绝) * 审核状态(0.待审,1.通过,2.拒绝)
*/ */
private Integer auditStatus; private Integer auditStatus;
public StaffLeaveEntity(){}
/**
* 获取 员工ID
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工ID
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getStaffName(){
return staffName;
}
/**
* 设置 员工姓名
* @param staffName
*/
public void setStaffName(String staffName){
this.staffName = staffName;
}
/**
* 获取 性别(1.男,2.女)
* @return Integer
*/
public Integer getGender(){
return gender;
}
/**
* 设置 性别(1.男,2.女)
* @param gender
*/
public void setGender(Integer gender){
this.gender = gender;
}
/**
* 获取 出生日期
* @return Date
*/
public Date getBirthday(){
return birthday;
}
/**
* 设置 出生日期
* @param birthday
*/
public void setBirthday(Date birthday){
this.birthday = birthday;
}
/**
* 获取 照片
* @return String
*/
public String getPhotoPath(){
return photoPath;
}
/**
* 设置 照片
* @param photoPath
*/
public void setPhotoPath(String photoPath){
this.photoPath = photoPath;
}
/**
* 获取 联系电话
* @return String
*/
public String getPhoneNumber(){
return phoneNumber;
}
/**
* 设置 联系电话
* @param phoneNumber
*/
public void setPhoneNumber(String phoneNumber){
this.phoneNumber = phoneNumber;
}
/**
* 获取 身份证号码
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证号码
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 工号
* @return String
*/
public String getWorkNum(){
return workNum;
}
/**
* 设置 工号
* @param workNum
*/
public void setWorkNum(String workNum){
this.workNum = workNum;
}
/**
* 获取 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @return Integer
*/
public Integer getPoliticalstatus(){
return politicalstatus;
}
/**
* 设置 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @param politicalstatus
*/
public void setPoliticalstatus(Integer politicalstatus){
this.politicalstatus = politicalstatus;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getJobId(){
return jobId;
}
/**
* 设置 职位ID
* @param jobId
*/
public void setJobId(Long jobId){
this.jobId = jobId;
}
/**
* 获取 职位名称
* @return String
*/
public String getJobName(){
return jobName;
}
/**
* 设置 职位名称
* @param jobName
*/
public void setJobName(String jobName){
this.jobName = jobName;
}
/**
* 获取 员工类型(1.全职,2.兼职,3.实习)
* @return Integer
*/
public Integer getStaffType(){
return staffType;
}
/**
* 设置 员工类型(1.全职,2.兼职,3.实习)
* @param staffType
*/
public void setStaffType(Integer staffType){
this.staffType = staffType;
}
/**
* 获取 员工状态(1.正式,2.试用,3.离职)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 员工状态(1.正式,2.试用,3.离职)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 入职时间
* @return Date
*/
public Date getEntryDate(){
return entryDate;
}
/**
* 设置 入职时间
* @param entryDate
*/
public void setEntryDate(Date entryDate){
this.entryDate = entryDate;
}
/**
* 获取 离职时间
* @return Date
*/
public Date getLeaveDate(){
return leaveDate;
}
/**
* 设置 离职时间
* @param leaveDate
*/
public void setLeaveDate(Date leaveDate){
this.leaveDate = leaveDate;
}
/**
* 获取 离职原因
* @return String
*/
public String getLeaveReason(){
return leaveReason;
}
/**
* 设置 离职原因
* @param leaveReason
*/
public void setLeaveReason(String leaveReason){
this.leaveReason = leaveReason;
}
/**
* 获取 审核状态(0.待审,1.通过,2.拒绝)
* @return Integer
*/
public Integer getAuditStatus(){
return auditStatus;
}
/**
* 设置 审核状态(0.待审,1.通过,2.拒绝)
* @param auditStatus
*/
public void setAuditStatus(Integer auditStatus){
this.auditStatus = auditStatus;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -383,68 +112,25 @@ public class StaffLeaveEntity extends StaffLeaveVo { ...@@ -383,68 +112,25 @@ public class StaffLeaveEntity extends StaffLeaveVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",gender:").append(getGender());
sb.append(",birthday:").append(getBirthday());
sb.append(",photoPath:").append(getPhotoPath());
sb.append(",phoneNumber:").append(getPhoneNumber());
sb.append(",idCard:").append(getIdCard());
sb.append(",workNum:").append(getWorkNum());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",jobId:").append(getJobId());
sb.append(",jobName:").append(getJobName());
sb.append(",staffType:").append(getStaffType());
sb.append(",status:").append(getStatus());
sb.append(",entryDate:").append(getEntryDate());
sb.append(",leaveDate:").append(getLeaveDate());
sb.append(",leaveReason:").append(getLeaveReason());
sb.append(",auditStatus:").append(getAuditStatus());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L;
this.staffId = null;
this.staffName = ""; this.staffName = "";
this.gender = 1; this.gender = 1;
this.birthday = new Date();
this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = 0L;
this.deptId = null;
this.deptName = ""; this.deptName = "";
this.jobId = 0L;
this.jobId = null;
this.jobName = ""; this.jobName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.entryDate = new Date();
this.entryDate = null; this.leaveDate = new Date();
this.leaveDate = null;
this.leaveReason = ""; this.leaveReason = "";
this.auditStatus = 0; this.auditStatus = 0;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffOnboardEntity.java
View file @ 04c44aa9
...@@ -2,17 +2,20 @@ package com.mortals.xhx.module.staff.model; ...@@ -2,17 +2,20 @@ package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffOnboardVo; import com.mortals.xhx.module.staff.model.vo.StaffOnboardVo;
import lombok.Data; import lombok.Data;
/** /**
* 员工入职信息实体对象 * 员工入职信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-16 * @date 2023-07-26
*/ */
@Data @Data
public class StaffOnboardEntity extends StaffOnboardVo { public class StaffOnboardEntity extends StaffOnboardVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -102,39 +105,22 @@ public class StaffOnboardEntity extends StaffOnboardVo { ...@@ -102,39 +105,22 @@ public class StaffOnboardEntity extends StaffOnboardVo {
} }
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L;
this.staffId = -1L;
this.staffName = ""; this.staffName = "";
this.gender = 1; this.gender = 1;
this.birthday = new Date();
this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.filePath = ""; this.filePath = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = 0L;
this.deptId = -1L;
this.deptName = ""; this.deptName = "";
this.jobId = 0L;
this.jobId = -1L;
this.jobName = ""; this.jobName = "";
this.staffType = 1; this.staffType = 1;
this.onBoardStatus = 1; this.onBoardStatus = 1;
this.entryDate = new Date();
this.entryDate = null;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffRegularEntity.java
View file @ 04c44aa9
package com.mortals.xhx.module.staff.model; package com.mortals.xhx.module.staff.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffRegularVo; import com.mortals.xhx.module.staff.model.vo.StaffRegularVo;
import lombok.Data;
/** /**
* 员工转正信息实体对象 * 员工转正信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffRegularEntity extends StaffRegularVo { public class StaffRegularEntity extends StaffRegularVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -89,266 +92,6 @@ public class StaffRegularEntity extends StaffRegularVo { ...@@ -89,266 +92,6 @@ public class StaffRegularEntity extends StaffRegularVo {
* 审核状态(0.待审核,1.通过,2.拒绝) * 审核状态(0.待审核,1.通过,2.拒绝)
*/ */
private Integer auditStatus; private Integer auditStatus;
public StaffRegularEntity(){}
/**
* 获取 员工ID
* @return Long
*/
public Long getStaffId(){
return staffId;
}
/**
* 设置 员工ID
* @param staffId
*/
public void setStaffId(Long staffId){
this.staffId = staffId;
}
/**
* 获取 员工姓名
* @return String
*/
public String getStaffName(){
return staffName;
}
/**
* 设置 员工姓名
* @param staffName
*/
public void setStaffName(String staffName){
this.staffName = staffName;
}
/**
* 获取 性别(1.男,2.女)
* @return Integer
*/
public Integer getGender(){
return gender;
}
/**
* 设置 性别(1.男,2.女)
* @param gender
*/
public void setGender(Integer gender){
this.gender = gender;
}
/**
* 获取 出生日期
* @return Date
*/
public Date getBirthday(){
return birthday;
}
/**
* 设置 出生日期
* @param birthday
*/
public void setBirthday(Date birthday){
this.birthday = birthday;
}
/**
* 获取 照片
* @return String
*/
public String getPhotoPath(){
return photoPath;
}
/**
* 设置 照片
* @param photoPath
*/
public void setPhotoPath(String photoPath){
this.photoPath = photoPath;
}
/**
* 获取 联系电话
* @return String
*/
public String getPhoneNumber(){
return phoneNumber;
}
/**
* 设置 联系电话
* @param phoneNumber
*/
public void setPhoneNumber(String phoneNumber){
this.phoneNumber = phoneNumber;
}
/**
* 获取 身份证号码
* @return String
*/
public String getIdCard(){
return idCard;
}
/**
* 设置 身份证号码
* @param idCard
*/
public void setIdCard(String idCard){
this.idCard = idCard;
}
/**
* 获取 工号
* @return String
*/
public String getWorkNum(){
return workNum;
}
/**
* 设置 工号
* @param workNum
*/
public void setWorkNum(String workNum){
this.workNum = workNum;
}
/**
* 获取 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @return Integer
*/
public Integer getPoliticalstatus(){
return politicalstatus;
}
/**
* 设置 政治面貌 （1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)
* @param politicalstatus
*/
public void setPoliticalstatus(Integer politicalstatus){
this.politicalstatus = politicalstatus;
}
/**
* 获取 所属部门
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 所属部门
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 所属部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 职位ID
* @return Long
*/
public Long getJobId(){
return jobId;
}
/**
* 设置 职位ID
* @param jobId
*/
public void setJobId(Long jobId){
this.jobId = jobId;
}
/**
* 获取 职位名称
* @return String
*/
public String getJobName(){
return jobName;
}
/**
* 设置 职位名称
* @param jobName
*/
public void setJobName(String jobName){
this.jobName = jobName;
}
/**
* 获取 员工类型(1.全职,2.兼职,3.实习)
* @return Integer
*/
public Integer getStaffType(){
return staffType;
}
/**
* 设置 员工类型(1.全职,2.兼职,3.实习)
* @param staffType
*/
public void setStaffType(Integer staffType){
this.staffType = staffType;
}
/**
* 获取 员工状态(1.正式,2.试用,3.离职)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 员工状态(1.正式,2.试用,3.离职)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 入职时间
* @return Date
*/
public Date getEntryDate(){
return entryDate;
}
/**
* 设置 入职时间
* @param entryDate
*/
public void setEntryDate(Date entryDate){
this.entryDate = entryDate;
}
/**
* 获取 计划转正时间
* @return Date
*/
public Date getRegularDate(){
return regularDate;
}
/**
* 设置 计划转正时间
* @param regularDate
*/
public void setRegularDate(Date regularDate){
this.regularDate = regularDate;
}
/**
* 获取 审核状态(0.待审核,1.通过,2.拒绝)
* @return Integer
*/
public Integer getAuditStatus(){
return auditStatus;
}
/**
* 设置 审核状态(0.待审核,1.通过,2.拒绝)
* @param auditStatus
*/
public void setAuditStatus(Integer auditStatus){
this.auditStatus = auditStatus;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -365,65 +108,24 @@ public class StaffRegularEntity extends StaffRegularVo { ...@@ -365,65 +108,24 @@ public class StaffRegularEntity extends StaffRegularVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",staffId:").append(getStaffId());
sb.append(",staffName:").append(getStaffName());
sb.append(",gender:").append(getGender());
sb.append(",birthday:").append(getBirthday());
sb.append(",photoPath:").append(getPhotoPath());
sb.append(",phoneNumber:").append(getPhoneNumber());
sb.append(",idCard:").append(getIdCard());
sb.append(",workNum:").append(getWorkNum());
sb.append(",politicalstatus:").append(getPoliticalstatus());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptName:").append(getDeptName());
sb.append(",jobId:").append(getJobId());
sb.append(",jobName:").append(getJobName());
sb.append(",staffType:").append(getStaffType());
sb.append(",status:").append(getStatus());
sb.append(",entryDate:").append(getEntryDate());
sb.append(",regularDate:").append(getRegularDate());
sb.append(",auditStatus:").append(getAuditStatus());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.staffId = 0L;
this.staffId = null;
this.staffName = ""; this.staffName = "";
this.gender = 1; this.gender = 1;
this.birthday = new Date();
this.birthday = null;
this.photoPath = ""; this.photoPath = "";
this.phoneNumber = ""; this.phoneNumber = "";
this.idCard = ""; this.idCard = "";
this.workNum = ""; this.workNum = "";
this.politicalstatus = 1; this.politicalstatus = 1;
this.deptId = 0L;
this.deptId = null;
this.deptName = ""; this.deptName = "";
this.jobId = 0L;
this.jobId = null;
this.jobName = ""; this.jobName = "";
this.staffType = 1; this.staffType = 1;
this.status = 1; this.status = 1;
this.entryDate = new Date();
this.entryDate = null; this.regularDate = new Date();
this.regularDate = null;
this.auditStatus = 0; this.auditStatus = 0;
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffAdjustLogVo.java
View file @ 04c44aa9
...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffAdjustLogEntity; import com.mortals.xhx.module.staff.model.StaffAdjustLogEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工调岗信息视图对象 * 员工调岗信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffAdjustLogVo extends BaseEntityLong { public class StaffAdjustLogVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffContractVo.java
View file @ 04c44aa9
...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffContractEntity; import com.mortals.xhx.module.staff.model.StaffContractEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工合同信息视图对象 * 员工合同信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffContractVo extends BaseEntityLong { public class StaffContractVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffLeaveVo.java
View file @ 04c44aa9
...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffLeaveEntity; import com.mortals.xhx.module.staff.model.StaffLeaveEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工离职信息视图对象 * 员工离职信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffLeaveVo extends BaseEntityLong { public class StaffLeaveVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffOnboardVo.java
View file @ 04c44aa9
...@@ -8,12 +8,16 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,12 +8,16 @@ import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* 员工入职信息视图对象 * 员工入职信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-07-16 * @date 2023-07-26
*/ */
@Data @Data
public class StaffOnboardVo extends BaseEntityLong { public class StaffOnboardVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffRegularVo.java
View file @ 04c44aa9
...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffRegularEntity; import com.mortals.xhx.module.staff.model.StaffRegularEntity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 员工转正信息视图对象 * 员工转正信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-07 * @date 2023-07-26
*/ */
@Data
public class StaffRegularVo extends BaseEntityLong { public class StaffRegularVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment