DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(employee): 添加员工管理模块中的时间范围查询功能

Browse Source 
- 在WmsEmployeeChangeBo中新增异动时间范围字段changeStartTime和changeEndTime
- 在WmsEmployeeInfoBo中新增入职时间范围字段entryStartTime和entryEndTime
- 在WmsEmployeeTransferBo中新增转岗时间范围字段transferStartTime和transferEndTime
- 为所有时间字段添加DateTimeFormat注解支持日期格式化
- 在对应的服务实现类中添加时间范围查询条件
- 实现时间段筛选逻辑以支持更精确的数据查询需求
This commit is contained in:
Joshi
2026-03-21 15:19:13 +08:00
parent 09de6e4e62
commit 0eba0b5def
6 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java
View File

@@ -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;
/**
* 异动原因（离职必填，入职可选）
*/

15
klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
View File

@@ -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;
/**
* 紧急联系人
*/

15
klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java
View File

@@ -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;
/**
* 转岗原因
*/

2
klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java
View File

@@ -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());

2
klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
View File

@@ -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());

2
klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java
View File

@@ -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());