From 7dcb779412af0229df180afe2852f85301156e98 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 18 Mar 2026 10:56:27 +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=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在WmsEmployeeInfo实体类中新增isRegular和regularTime字段
- 在WmsEmployeeInfoBo业务对象中添加转正相关属性定义
- 配置MyBatis映射文件中的转正状态字段映射关系
- 实现员工服务层中的转正状态查询条件过滤逻辑
- 在WmsEmployeeInfoVo视图对象中添加转正状态返回字段
---
klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java | 7 +++++++
.../src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 6 ++++++
.../src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java | 7 +++++++
.../com/klp/service/impl/WmsEmployeeInfoServiceImpl.java | 2 ++
.../main/resources/mapper/klp/WmsEmployeeInfoMapper.xml | 2 ++
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 cc5f7959..82139702 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -98,4 +98,11 @@ public class WmsEmployeeInfo extends BaseEntity {
// 是否离职
private Integer isLeave;
+
+ // 是否转正：0=未转正，1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 9cad8870..84b10c35 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
@@ -108,5 +108,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
// 是否离职
private Integer isLeave;
+ // 是否转正：0=未转正，1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 4e738126..bc5896f6 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
@@ -126,4 +126,11 @@ public class WmsEmployeeInfoVo {
// 是否离职
private Integer isLeave;
+
+ // 是否转正：0=未转正，1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 ba85df83..3c5f1c9c 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
@@ -78,6 +78,8 @@ 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.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
return lqw;
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
index f8ea5420..3af9502c 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -28,6 +28,8 @@
+
+