feat(employee): 添加员工信息和变动记录的排序功能
- 在WmsEmployeeInfoBo中新增sortByRegularTime和sortByEntryTime字段 - 实现员工信息按入职时间、转正时间或创建时间的倒序排序 - 添加员工变动记录按变动时间的倒序排序 - 实现员工转岗记录按转岗时间的倒序排序 - 优化查询条件构建逻辑,支持多维度排序需求
This commit is contained in:
@@ -86,6 +86,17 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
|
||||
// 按照转正开始时间和转正结束时间进行查询
|
||||
lqw.ge(bo.getRegularStartTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularStartTime());
|
||||
lqw.le(bo.getRegularEndTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularEndTime());
|
||||
|
||||
// 排序逻辑:优先判断入职时间排序,其次转正时间排序,默认创建时间倒序
|
||||
if (Boolean.TRUE.equals(bo.getSortByEntryTime())) {
|
||||
lqw.orderByDesc(WmsEmployeeInfo::getEntryTime);
|
||||
} else if (Boolean.TRUE.equals(bo.getSortByRegularTime())) {
|
||||
lqw.orderByDesc(WmsEmployeeInfo::getRegularTime);
|
||||
} else {
|
||||
// 默认按照创建时间倒序排序 (假设实体类中有 createTime 字段,若字段名不同请调整)
|
||||
lqw.orderByDesc(WmsEmployeeInfo::getCreateTime);
|
||||
}
|
||||
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user