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 82139702..41f612ab 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java @@ -99,6 +99,9 @@ public class WmsEmployeeInfo extends BaseEntity { // 是否离职 private Integer isLeave; + // 离职时间 + private Date leaveTime; + // 是否转正: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 efdd9a37..65d625ac 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 @@ -123,6 +123,19 @@ public class WmsEmployeeInfoBo extends BaseEntity { // 是否离职 private Integer isLeave; + // 离职时间 + private Date leaveTime; + + // 离职时间开始 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date leaveStartTime; + + // 离职时间结束 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date leaveEndTime; + // 是否转正: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 bc5896f6..826f8b55 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 @@ -127,6 +127,10 @@ public class WmsEmployeeInfoVo { // 是否离职 private Integer isLeave; + // 离职时间 + @JsonFormat(pattern = "yyyy-MM-dd") + private Date leaveTime; + // 是否转正: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 b84e8363..dd65e9f8 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 @@ -80,6 +80,9 @@ 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.ge(bo.getLeaveStartTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveStartTime()); + lqw.le(bo.getLeaveEndTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveEndTime()); // 是否转正 lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml index 3af9502c..881b0855 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml @@ -28,6 +28,7 @@ +