feat(employee): 添加员工转正时间范围查询功能
- 在 WmsEmployeeInfoBo 中新增转正开始时间和转正结束时间字段 - 为新字段添加 JSON 格式化和日期时间格式化注解 - 在服务实现中添加按转正时间范围查询的条件构建逻辑 - 支持通过转正开始时间和结束时间进行员工信息筛选查询
This commit is contained in:
@@ -130,4 +130,13 @@ public class WmsEmployeeInfoBo extends BaseEntity {
|
||||
@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;
|
||||
}
|
||||
|
||||
@@ -82,6 +82,10 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
|
||||
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
|
||||
// 是否转正
|
||||
lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
|
||||
|
||||
// 按照转正开始时间和转正结束时间进行查询
|
||||
lqw.ge(bo.getRegularStartTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularStartTime());
|
||||
lqw.le(bo.getRegularEndTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularEndTime());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user