From 0eba0b5defdabcb88b6163ff6ca1926682d5df0d Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 21 Mar 2026 15:19:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsEmployeeChangeBo中新增异动时间范围字段changeStartTime和changeEndTime - 在WmsEmployeeInfoBo中新增入职时间范围字段entryStartTime和entryEndTime - 在WmsEmployeeTransferBo中新增转岗时间范围字段transferStartTime和transferEndTime - 为所有时间字段添加DateTimeFormat注解支持日期格式化 - 在对应的服务实现类中添加时间范围查询条件 - 实现时间段筛选逻辑以支持更精确的数据查询需求 --- .../com/klp/domain/bo/WmsEmployeeChangeBo.java | 14 ++++++++++++++ .../java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 15 +++++++++++++++ .../com/klp/domain/bo/WmsEmployeeTransferBo.java | 15 +++++++++++++++ .../impl/WmsEmployeeChangeServiceImpl.java | 2 ++ .../service/impl/WmsEmployeeInfoServiceImpl.java | 2 ++ .../impl/WmsEmployeeTransferServiceImpl.java | 2 ++ 6 files changed, 50 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java index 8df40373..1dfcf97a 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 员工异动（入职/离职）业务对象 wms_employee_change @@ -39,6 +40,19 @@ public class WmsEmployeeChangeBo extends BaseEntity { */ private Date changeTime; + /** + * 异动时间开始 带时分秒 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date changeStartTime; + + /** + * 异动时间结束 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date changeEndTime; /** * 异动原因（离职必填，入职可选） */ 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 84b10c35..80cb76aa 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 @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 员工信息业务对象 wms_employee_info @@ -79,6 +80,20 @@ public class WmsEmployeeInfoBo extends BaseEntity { */ private Date entryTime; + /** + * 入职时间开始 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date entryStartTime; + + /** + * 入职时间结束 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date entryEndTime; + /** * 紧急联系人 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java index 2ac14575..9dd27919 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 员工转岗记录业务对象 wms_employee_transfer @@ -54,6 +55,20 @@ public class WmsEmployeeTransferBo extends BaseEntity { */ private Date transferTime; + /** + * 转岗时间开始 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date transferStartTime; + + /** + * 转岗时间结束 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date transferEndTime; + /** * 转岗原因 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java index bd45cbfc..18f6174c 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java @@ -82,6 +82,8 @@ public class WmsEmployeeChangeServiceImpl implements IWmsEmployeeChangeService { lqw.eq(bo.getInfoId() != null, WmsEmployeeChange::getInfoId, bo.getInfoId()); lqw.eq(bo.getChangeType() != null, WmsEmployeeChange::getChangeType, bo.getChangeType()); lqw.eq(bo.getChangeTime() != null, WmsEmployeeChange::getChangeTime, bo.getChangeTime()); + lqw.ge(bo.getChangeStartTime() != null, WmsEmployeeChange::getChangeTime, bo.getChangeStartTime()); + lqw.le(bo.getChangeEndTime() != null, WmsEmployeeChange::getChangeTime, bo.getChangeEndTime()); lqw.eq(StringUtils.isNotBlank(bo.getChangeReason()), WmsEmployeeChange::getChangeReason, bo.getChangeReason()); lqw.eq(StringUtils.isNotBlank(bo.getChangeHandler()), WmsEmployeeChange::getChangeHandler, bo.getChangeHandler()); lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WmsEmployeeChange::getAttachment, bo.getAttachment()); 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 3c5f1c9c..2005b3c8 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 @@ -72,6 +72,8 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService { lqw.eq(StringUtils.isNotBlank(bo.getHomeAddress()), WmsEmployeeInfo::getHomeAddress, bo.getHomeAddress()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), WmsEmployeeInfo::getPhone, bo.getPhone()); lqw.eq(bo.getEntryTime() != null, WmsEmployeeInfo::getEntryTime, bo.getEntryTime()); + 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(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship()); lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone()); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java index a10b790d..54710c38 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java @@ -89,6 +89,8 @@ public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferServi lqw.eq(StringUtils.isNotBlank(bo.getNewDept()), WmsEmployeeTransfer::getNewDept, bo.getNewDept()); lqw.eq(StringUtils.isNotBlank(bo.getNewJobType()), WmsEmployeeTransfer::getNewJobType, bo.getNewJobType()); lqw.eq(bo.getTransferTime() != null, WmsEmployeeTransfer::getTransferTime, bo.getTransferTime()); + lqw.ge(bo.getTransferStartTime() != null, WmsEmployeeTransfer::getTransferTime, bo.getTransferStartTime()); + lqw.le(bo.getTransferEndTime() != null, WmsEmployeeTransfer::getTransferTime, bo.getTransferEndTime()); lqw.eq(StringUtils.isNotBlank(bo.getTransferReason()), WmsEmployeeTransfer::getTransferReason, bo.getTransferReason()); lqw.eq(StringUtils.isNotBlank(bo.getTransferHandler()), WmsEmployeeTransfer::getTransferHandler, bo.getTransferHandler()); lqw.eq(bo.getApprovalStatus() != null, WmsEmployeeTransfer::getApprovalStatus, bo.getApprovalStatus());