feat(employee): 添加员工离职时间字段及查询功能
- 在WmsEmployeeInfo实体类中添加离职时间字段 - 在WmsEmployeeInfoBo业务对象中添加离职时间及相关查询条件字段 - 在WmsEmployeeInfoVo视图对象中添加离职时间字段并配置日期格式 - 更新MyBatis映射文件添加离职时间字段映射 - 实现离职时间范围查询功能支持
This commit is contained in:
@@ -99,6 +99,9 @@ public class WmsEmployeeInfo extends BaseEntity {
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 离职时间
|
||||
private Date leaveTime;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
|
||||
@@ -123,6 +123,19 @@ public class WmsEmployeeInfoBo extends BaseEntity {
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 离职时间
|
||||
private Date leaveTime;
|
||||
|
||||
// 离职时间开始
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date leaveStartTime;
|
||||
|
||||
// 离职时间结束
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date leaveEndTime;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
|
||||
@@ -127,6 +127,10 @@ public class WmsEmployeeInfoVo {
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 离职时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date leaveTime;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
|
||||
@@ -80,6 +80,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
|
||||
// 是否离职
|
||||
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
|
||||
// 离职时间范围查询
|
||||
lqw.ge(bo.getLeaveStartTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveStartTime());
|
||||
lqw.le(bo.getLeaveEndTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveEndTime());
|
||||
// 是否转正
|
||||
lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user