Joshi
e1dd76ee4a
- 在WmsEmployeeInfoBo中新增sortByRegularTime和sortByEntryTime字段 - 实现员工信息按入职时间、转正时间或创建时间的倒序排序 - 添加员工变动记录按变动时间的倒序排序 - 实现员工转岗记录按转岗时间的倒序排序 - 优化查询条件构建逻辑，支持多维度排序需求
147 lines
2.5 KiB
Java
147 lines
2.5 KiB
Java
package com.klp.domain.bo;
|
||
|
||
import com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
import lombok.EqualsAndHashCode;
|
||
import javax.validation.constraints.*;
|
||
|
||
import java.util.Date;
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
import org.springframework.format.annotation.DateTimeFormat;
|
||
|
||
/**
|
||
* 员工信息业务对象 wms_employee_info
|
||
*
|
||
* @author klp
|
||
* @date 2026-03-02
|
||
*/
|
||
|
||
@Data
|
||
@EqualsAndHashCode(callSuper = true)
|
||
public class WmsEmployeeInfoBo extends BaseEntity {
|
||
|
||
/**
|
||
* 主键ID
|
||
*/
|
||
private Long infoId;
|
||
|
||
/**
|
||
* 序号
|
||
*/
|
||
private Long serialNumber;
|
||
|
||
/**
|
||
* 部门
|
||
*/
|
||
private String dept;
|
||
|
||
/**
|
||
* 岗位工种
|
||
*/
|
||
private String jobType;
|
||
|
||
/**
|
||
* 姓名
|
||
*/
|
||
private String name;
|
||
|
||
/**
|
||
* 身份证号
|
||
*/
|
||
private String idCard;
|
||
|
||
/**
|
||
* 年龄
|
||
*/
|
||
private Long age;
|
||
|
||
/**
|
||
* 性别（男/女）
|
||
*/
|
||
private String gender;
|
||
|
||
/**
|
||
* 学历
|
||
*/
|
||
private String education;
|
||
|
||
/**
|
||
* 家庭住址
|
||
*/
|
||
private String homeAddress;
|
||
|
||
/**
|
||
* 联系电话
|
||
*/
|
||
private String phone;
|
||
|
||
/**
|
||
* 入职时间
|
||
*/
|
||
private Date entryTime;
|
||
|
||
/**
|
||
* 入职时间开始
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date entryStartTime;
|
||
|
||
/**
|
||
* 入职时间结束
|
||
*/
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date entryEndTime;
|
||
|
||
/**
|
||
* 紧急联系人
|
||
*/
|
||
private String emergencyContact;
|
||
|
||
/**
|
||
* 关系
|
||
*/
|
||
private String relationship;
|
||
|
||
/**
|
||
* 紧急联系人电话
|
||
*/
|
||
private String emergencyContactPhone;
|
||
|
||
/**
|
||
* 社保类型（三险/五险）
|
||
*/
|
||
private String socialInsuranceType;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
private String remark;
|
||
|
||
|
||
// 是否离职
|
||
private Integer isLeave;
|
||
|
||
// 是否转正：0=未转正，1=已转正
|
||
private Integer isRegular;
|
||
|
||
// 转正时间
|
||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||
private Date regularTime;
|
||
|
||
// 转正开始时间
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date regularStartTime;
|
||
|
||
// 转正结束时间
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date regularEndTime;
|
||
|
||
|
||
private Boolean sortByRegularTime;
|
||
private Boolean sortByEntryTime;
|
||
}
|