From 2fb5a64124730b5be9037f8eb7cabdc29f72fbb4 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 18 Jun 2026 10:39:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=98=AF=E5=90=A6=E5=90=83=E8=BE=A3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsEmployeeInfo 实体类中新增 isSpicyEater 字段
- 在 WmsEmployeeInfoBo 业务对象中添加 isSpicyEater 属性
- 更新 WmsEmployeeInfoMapper.xml 映射文件配置
- 在查询条件中添加 isSpicyEater 过滤逻辑
- 在 WmsEmployeeInfoVo 视图对象中添加 Excel 导出支持
---
 klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java    | 3 +++
 .../src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java   | 3 +++
 .../src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java   | 5 +++++
 .../com/klp/service/impl/WmsEmployeeInfoServiceImpl.java     | 1 +
 .../src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml  | 1 +
 5 files changed, 13 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 41f612ab..4875d185 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -102,6 +102,9 @@ public class WmsEmployeeInfo extends BaseEntity {
     // 离职时间
     private Date leaveTime;
 
+    // 是否吃辣：0=否，1=是
+    private Integer isSpicyEater;
+
     // 是否转正：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 65d625ac..bd259c6c 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
@@ -136,6 +136,9 @@ public class WmsEmployeeInfoBo extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date leaveEndTime;
 
+    // 是否吃辣：0=否，1=是
+    private Integer isSpicyEater;
+
     // 是否转正：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 826f8b55..39214137 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
@@ -131,6 +131,11 @@ public class WmsEmployeeInfoVo {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date leaveTime;
 
+    // 是否吃辣：0=否，1=是
+    @ExcelProperty(value = "是否吃辣", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=否,1=是")
+    private Integer isSpicyEater;
+
     // 是否转正：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 dd65e9f8..9e08ba55 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
@@ -75,6 +75,7 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
         lqw.ge(bo.getEntryStartTime() != null, WmsEmployeeInfo::getEntryTime, bo.getEntryStartTime());
         lqw.le(bo.getEntryEndTime() != null, WmsEmployeeInfo::getEntryTime, bo.getEntryEndTime());
         lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact());
+        lqw.eq(bo.getIsSpicyEater() != null, WmsEmployeeInfo::getIsSpicyEater, bo.getIsSpicyEater());
         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());
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
index 881b0855..305120f1 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 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="isSpicyEater" column="is_spicy_eater"/>
         <result property="isLeave" column="is_leave"/>
         <result property="leaveTime" column="leave_time"/>
         <result property="isRegular" column="is_regular"/>