feat(employee): 添加员工转正状态管理功能
- 在WmsEmployeeInfo实体类中新增isRegular和regularTime字段 - 在WmsEmployeeInfoBo业务对象中添加转正相关属性定义 - 配置MyBatis映射文件中的转正状态字段映射关系 - 实现员工服务层中的转正状态查询条件过滤逻辑 - 在WmsEmployeeInfoVo视图对象中添加转正状态返回字段
This commit is contained in:
@@ -98,4 +98,11 @@ public class WmsEmployeeInfo extends BaseEntity {
|
||||
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
// 转正时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date regularTime;
|
||||
}
|
||||
|
||||
@@ -108,5 +108,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
// 转正时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date regularTime;
|
||||
|
||||
}
|
||||
|
||||
@@ -126,4 +126,11 @@ public class WmsEmployeeInfoVo {
|
||||
|
||||
// 是否离职
|
||||
private Integer isLeave;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
// 转正时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date regularTime;
|
||||
}
|
||||
|
||||
@@ -78,6 +78,8 @@ 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.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user