From 99488b828a3b04cc59f6b5adf99be1d337a7e106 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 21 Mar 2026 15:25:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E8=BD=AC=E6=AD=A3=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsEmployeeInfoBo 中新增转正开始时间和转正结束时间字段
- 为新字段添加 JSON 格式化和日期时间格式化注解
- 在服务实现中添加按转正时间范围查询的条件构建逻辑
- 支持通过转正开始时间和结束时间进行员工信息筛选查询
---
 .../main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java   | 9 +++++++++
 .../com/klp/service/impl/WmsEmployeeInfoServiceImpl.java | 4 ++++
 2 files changed, 13 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 80cb76aa..25918260 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
@@ -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;
 }
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 2005b3c8..4c674936 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
@@ -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;
     }