Commit 04c44aa9 authored by 赵啸非's avatar 赵啸非

修改员工管理初始状态

parent da95e82d
......@@ -2,92 +2,95 @@ package com.mortals.xhx.module.staff.model;
import java.util.Date;
import java.util.List;
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.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffOnboardVo;
import lombok.Data;
/**
* 员工入职信息实体对象
*
* @author zxfei
* @date 2023-07-16
*/
* 员工入职信息实体对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class StaffOnboardEntity extends StaffOnboardVo {
private static final long serialVersionUID = 1L;
/**
* 员工ID
*/
* 员工ID
*/
private Long staffId;
/**
* 员工姓名
*/
* 员工姓名
*/
private String staffName;
/**
* 性别(1.男,2.女)
*/
* 性别(1.男,2.女)
*/
private Integer gender;
/**
* 出生日期
*/
* 出生日期
*/
private Date birthday;
/**
* 照片
*/
* 照片
*/
private String photoPath;
/**
* 联系电话
*/
* 联系电话
*/
private String phoneNumber;
/**
* 身份证号码
*/
* 身份证号码
*/
private String idCard;
/**
* 工号
*/
* 工号
*/
private String workNum;
/**
* 入职登记表
*/
* 入职登记表
*/
private String filePath;
/**
* 政治面貌 (1.中共党员,2.中共预备党员,3.共青团员,4.群众,5.其它)
*/
* 政治面貌 (1.中共党员,2.中共预备党员,3.共青团员,4.群众,5.其它)
*/
private Integer politicalstatus;
/**
* 所属部门
*/
* 所属部门
*/
private Long deptId;
/**
* 所属部门名称
*/
* 所属部门名称
*/
private String deptName;
/**
* 职位ID
*/
* 职位ID
*/
private Long jobId;
/**
* 职位名称
*/
* 职位名称
*/
private String jobName;
/**
* 员工类型(1.全职,2.兼职,3.实习)
*/
* 员工类型(1.全职,2.兼职,3.实习)
*/
private Integer staffType;
/**
* 员工状态(1.待入职,2.试用中,3.超期)
*/
* 员工状态(1.待入职,2.试用中,3.超期)
*/
private Integer onBoardStatus;
/**
* 入职时间
*/
* 入职时间
*/
private Date entryDate;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -95,46 +98,29 @@ public class StaffOnboardEntity extends StaffOnboardVo {
if (obj instanceof StaffOnboardEntity) {
StaffOnboardEntity tmp = (StaffOnboardEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
}
public void initAttrValue(){
this.staffId = -1L;
this.staffName = "";
this.gender = 1;
this.birthday = null;
this.photoPath = "";
this.phoneNumber = "";
this.idCard = "";
this.workNum = "";
this.filePath = "";
this.politicalstatus = 1;
this.deptId = -1L;
this.deptName = "";
this.jobId = -1L;
this.jobName = "";
this.staffType = 1;
this.onBoardStatus = 1;
this.entryDate = null;
this.staffId = 0L;
this.staffName = "";
this.gender = 1;
this.birthday = new Date();
this.photoPath = "";
this.phoneNumber = "";
this.idCard = "";
this.workNum = "";
this.filePath = "";
this.politicalstatus = 1;
this.deptId = 0L;
this.deptName = "";
this.jobId = 0L;
this.jobName = "";
this.staffType = 1;
this.onBoardStatus = 1;
this.entryDate = new Date();
}
}
\ No newline at end of file
......@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffAdjustLogEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 员工调岗信息视图对象
*
* @author zxfei
* @date 2023-04-07
*/
* 员工调岗信息视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class StaffAdjustLogVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffContractEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 员工合同信息视图对象
*
* @author zxfei
* @date 2023-04-07
*/
* 员工合同信息视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class StaffContractVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffLeaveEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 员工离职信息视图对象
*
* @author zxfei
* @date 2023-04-07
*/
* 员工离职信息视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class StaffLeaveVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -8,12 +8,16 @@ import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 员工入职信息视图对象
*
* @author zxfei
* @date 2023-07-16
*/
* 员工入职信息视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class StaffOnboardVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
......@@ -3,12 +3,21 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.StaffRegularEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 员工转正信息视图对象
*
* @author zxfei
* @date 2023-04-07
*/
* 员工转正信息视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
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