From 876bb48b1d6bbc42b0ecd19f4701702ef104e51e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 24 Mar 2026 14:48:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0=E5=91=98?=
=?UTF-8?q?=E5=B7=A5=E7=A6=BB=E8=81=8C=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E5=8F=8A=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
- 在WmsEmployeeInfo实体类中添加离职时间字段
- 在WmsEmployeeInfoBo业务对象中添加离职时间及相关查询条件字段
- 在WmsEmployeeInfoVo视图对象中添加离职时间字段并配置日期格式
- 更新MyBatis映射文件添加离职时间字段映射
- 实现离职时间范围查询功能支持
---
.../main/java/com/klp/domain/WmsEmployeeInfo.java | 3 +++
.../java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 13 +++++++++++++
.../java/com/klp/domain/vo/WmsEmployeeInfoVo.java | 4 ++++
.../service/impl/WmsEmployeeInfoServiceImpl.java | 3 +++
.../resources/mapper/klp/WmsEmployeeInfoMapper.xml | 1 +
5 files changed, 24 insertions(+)
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
index 82139702..41f612ab 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -99,6 +99,9 @@ public class WmsEmployeeInfo extends BaseEntity {
// 是否离职
private Integer isLeave;
+ // 离职时间
+ private Date leaveTime;
+
// 是否转正：0=未转正，1=已转正
private Integer isRegular;
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 efdd9a37..65d625ac 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
@@ -123,6 +123,19 @@ public class WmsEmployeeInfoBo extends BaseEntity {
// 是否离职
private Integer isLeave;
+ // 离职时间
+ private Date leaveTime;
+
+ // 离职时间开始
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leaveStartTime;
+
+ // 离职时间结束
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leaveEndTime;
+
// 是否转正：0=未转正，1=已转正
private Integer isRegular;
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
index bc5896f6..826f8b55 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
@@ -127,6 +127,10 @@ public class WmsEmployeeInfoVo {
// 是否离职
private Integer isLeave;
+ // 离职时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date leaveTime;
+
// 是否转正：0=未转正，1=已转正
private Integer isRegular;
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 b84e8363..dd65e9f8 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
@@ -80,6 +80,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
// 是否离职
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
+ // 离职时间范围查询
+ lqw.ge(bo.getLeaveStartTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveStartTime());
+ lqw.le(bo.getLeaveEndTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveEndTime());
// 是否转正
lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
index 3af9502c..881b0855 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -28,6 +28,7 @@
+