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 80cb76aa..25918260 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 @@ -130,4 +130,13 @@ public class WmsEmployeeInfoBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date regularTime; + // 转正开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date regularStartTime; + + // 转正结束时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date regularEndTime; } 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 2005b3c8..4c674936 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 @@ -82,6 +82,10 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService { lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave()); // 是否转正 lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular()); + + // 按照转正开始时间和转正结束时间进行查询 + lqw.ge(bo.getRegularStartTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularStartTime()); + lqw.le(bo.getRegularEndTime() != null, WmsEmployeeInfo::getRegularTime, bo.getRegularEndTime()); return lqw; }