From 0091a46811358c43c9385029c84189e1a9f7dffc Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 14 Mar 2026 09:57:31 +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=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在WmsEmployeeInfo实体类中添加isLeave字段
- 在WmsEmployeeInfoBo业务对象中添加isLeave字段
- 在WmsEmployeeInfoVo视图对象中添加isLeave字段
- 在MyBatis映射文件中添加isLeave字段映射
- 在查询条件构造器中添加离职状态筛选逻辑
---
klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java | 2 ++
.../src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 4 ++++
.../src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java | 2 ++
.../java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java | 2 ++
.../src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml | 1 +
5 files changed, 11 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 67121aee..cc5f7959 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -96,4 +96,6 @@ public class WmsEmployeeInfo extends BaseEntity {
*/
private String remark;
+ // 是否离职
+ private Integer isLeave;
}
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 bb8f9d34..9cad8870 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
@@ -105,4 +105,8 @@ public class WmsEmployeeInfoBo extends BaseEntity {
private String remark;
+ // 是否离职
+ private Integer isLeave;
+
+
}
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 b5e33d7f..4e738126 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
@@ -124,4 +124,6 @@ public class WmsEmployeeInfoVo {
private String remark;
+ // 是否离职
+ private Integer isLeave;
}
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 37f51e06..ba85df83 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
@@ -76,6 +76,8 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
+ // 是否离职
+ lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
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 d1b8bb11..f8ea5420 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -27,6 +27,7 @@
+