From e1dd76ee4a3ce555062de1029c5eec8d65024588 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 23 Mar 2026 09:20:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF=E5=92=8C=E5=8F=98=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsEmployeeInfoBo中新增sortByRegularTime和sortByEntryTime字段 - 实现员工信息按入职时间、转正时间或创建时间的倒序排序 - 添加员工变动记录按变动时间的倒序排序 - 实现员工转岗记录按转岗时间的倒序排序 - 优化查询条件构建逻辑，支持多维度排序需求 --- .../java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 4 ++++ .../service/impl/WmsEmployeeChangeServiceImpl.java | 2 ++ .../klp/service/impl/WmsEmployeeInfoServiceImpl.java | 11 +++++++++++ .../service/impl/WmsEmployeeTransferServiceImpl.java | 3 +++ 4 files changed, 20 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java index 25918260..efdd9a37 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java @@ -139,4 +139,8 @@ public class WmsEmployeeInfoBo extends BaseEntity { @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; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java index 18f6174c..cf3c94c1 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java @@ -87,6 +87,8 @@ public class WmsEmployeeChangeServiceImpl implements IWmsEmployeeChangeService { lqw.eq(StringUtils.isNotBlank(bo.getChangeReason()), WmsEmployeeChange::getChangeReason, bo.getChangeReason()); lqw.eq(StringUtils.isNotBlank(bo.getChangeHandler()), WmsEmployeeChange::getChangeHandler, bo.getChangeHandler()); lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WmsEmployeeChange::getAttachment, bo.getAttachment()); + // 按照变动时间倒叙排序 + lqw.orderByDesc(WmsEmployeeChange::getChangeTime); return lqw; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java index 4c674936..b84e8363 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java @@ -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; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java index 54710c38..dab918bc 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java @@ -95,6 +95,9 @@ public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferServi lqw.eq(StringUtils.isNotBlank(bo.getTransferHandler()), WmsEmployeeTransfer::getTransferHandler, bo.getTransferHandler()); lqw.eq(bo.getApprovalStatus() != null, WmsEmployeeTransfer::getApprovalStatus, bo.getApprovalStatus()); lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WmsEmployeeTransfer::getAttachment, bo.getAttachment()); + + // 按照转岗时间倒叙排序 + lqw.orderByDesc(WmsEmployeeTransfer::getTransferTime); return lqw; }