Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

- 在WmsEmployeeInfoBo中新增sortByRegularTime和sortByEntryTime字段
- 实现员工信息按入职时间、转正时间或创建时间的倒序排序
- 添加员工变动记录按变动时间的倒序排序
- 实现员工转岗记录按转岗时间的倒序排序
- 优化查询条件构建逻辑，支持多维度排序需求

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;
 }

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;
     }
 

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;
     }
 

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;
     }