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

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-01-19 13:02:31 +08:00
parent 3e172771f6 e2d0f07b40
commit cd0f93f60f
3 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 员工请假申请业务对象 wms_leave_request
@@ -48,23 +49,17 @@ public class WmsLeaveRequestBo extends BaseEntity {
/**
* 请假开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/**
* 请假结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/**
* 查询开始时间（用于筛选请假时间范围）
*/
private Date beginTime;
/**
* 查询结束时间（用于筛选请假时间范围）
*/
private Date endTimeParam;
/**
* 导出ID列表（逗号分隔）
*/

2
klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java
View File

@@ -38,7 +38,6 @@ public class WmsLeaveRequestVo extends BaseEntity {
* 请假类型（年假/事假/病假/调休/外出/出差等）
*/
@ExcelProperty(value = "请假类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "年=假/事假/病假/调休/外出/出差等")
private String leaveType;
/**
@@ -69,7 +68,6 @@ public class WmsLeaveRequestVo extends BaseEntity {
* 请假班次（早班/中班/晚班/夜班/全天等）
*/
@ExcelProperty(value = "请假班次", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "早=班/中班/晚班/夜班/全天等")
private String leaveShift;
/**

30
klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
View File

@@ -86,14 +86,14 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsLeaveRequest::getApplicantDeptName, bo.getApplicantDeptName());
// 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录
// 条件：(start_time <= endTimeParam AND end_time >= beginTime)
if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam())
.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
} else if (bo.getBeginTime() != null) {
lqw.ge(WmsLeaveRequest::getEndTime, bo.getBeginTime());
} else if (bo.getEndTimeParam() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTimeParam());
// 条件：(start_time <= endTime AND end_time >= startTime)
if (bo.getStartTime() != null && bo.getEndTime() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime())
.ge(WmsLeaveRequest::getEndTime, bo.getStartTime());
} else if (bo.getStartTime() != null) {
lqw.ge(WmsLeaveRequest::getEndTime, bo.getStartTime());
} else if (bo.getEndTime() != null) {
lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime());
}
lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime());
@@ -222,13 +222,13 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
.eq("del_flag", 0);
// 时间范围筛选
if (bo.getBeginTime() != null && bo.getEndTimeParam() != null) {
qw.le("start_time", bo.getEndTimeParam())
.ge("end_time", bo.getBeginTime());
} else if (bo.getBeginTime() != null) {
qw.ge("end_time", bo.getBeginTime());
} else if (bo.getEndTimeParam() != null) {
qw.le("start_time", bo.getEndTimeParam());
if (bo.getStartTime() != null && bo.getEndTime() != null) {
qw.le("start_time", bo.getEndTime())
.ge("end_time", bo.getStartTime());
} else if (bo.getStartTime() != null) {
qw.ge("end_time", bo.getStartTime());
} else if (bo.getEndTime() != null) {
qw.le("start_time", bo.getEndTime());
}
// 其他筛选条件