feat(employee): 添加员工是否吃辣字段支持
- 在 WmsEmployeeInfo 实体类中新增 isSpicyEater 字段 - 在 WmsEmployeeInfoBo 业务对象中添加 isSpicyEater 属性 - 更新 WmsEmployeeInfoMapper.xml 映射文件配置 - 在查询条件中添加 isSpicyEater 过滤逻辑 - 在 WmsEmployeeInfoVo 视图对象中添加 Excel 导出支持
This commit is contained in:
@@ -102,6 +102,9 @@ public class WmsEmployeeInfo extends BaseEntity {
|
||||
// 离职时间
|
||||
private Date leaveTime;
|
||||
|
||||
// 是否吃辣:0=否,1=是
|
||||
private Integer isSpicyEater;
|
||||
|
||||
// 是否转正:0=未转正,1=已转正
|
||||
private Integer isRegular;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
Reference in New Issue
Block a user