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 @@ +