diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index 49787c3a..2d520ed1 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -172,8 +172,8 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { "COUNT(*) as count", "SUM(leave_days) as total_days") .eq(bo.getApplicantDeptName() != null, "applicant_dept_name", bo.getApplicantDeptName()) - .le(bo.getStartTime() != null, "start_time", bo.getEndTime()) // 开始时间 <= 查询结束时间 - .ge(bo.getEndTime() != null, "end_time", bo.getStartTime()) // 结束时间 >= 查询开始时间 + .ge(bo.getStartTime() != null, "end_time", bo.getStartTime()) // 请假结束时间 >= 查询开始时间 + .le(bo.getEndTime() != null, "start_time", bo.getEndTime()) // 请假开始时间 <= 查询结束时间 .eq("del_flag", 0) .groupBy("leave_type") .orderByDesc("total_days"); @@ -191,8 +191,8 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { "SUM(leave_days) as total_days") .isNotNull("applicant_dept_name") .eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType()) - .le(bo.getStartTime() != null, "start_time", bo.getEndTime()) // 开始时间 <= 查询结束时间 - .ge(bo.getEndTime() != null, "end_time", bo.getStartTime()) // 结束时间 >= 查询开始时间 + .ge(bo.getStartTime() != null, "end_time", bo.getStartTime()) // 请假结束时间 >= 查询开始时间 + .le(bo.getEndTime() != null, "start_time", bo.getEndTime()) // 请假开始时间 <= 查询结束时间 .eq("del_flag", 0) .groupBy("applicant_dept_name") .orderByDesc("total_days"); @@ -208,8 +208,8 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { qw.select("DATE_FORMAT(start_time, '%Y-%m') as month", "COUNT(*) as count", "SUM(leave_days) as total_days") - .le(bo.getStartTime() != null, "start_time", bo.getEndTime()) // 开始时间 <= 查询结束时间 - .ge(bo.getEndTime() != null, "end_time", bo.getStartTime()) // 结束时间 >= 查询开始时间 + .ge(bo.getStartTime() != null, "end_time", bo.getStartTime()) // 请假结束时间 >= 查询开始时间 + .le(bo.getEndTime() != null, "start_time", bo.getEndTime()) // 请假开始时间 <= 查询结束时间 .eq(StringUtils.isNotBlank(bo.getLeaveType()), "leave_type", bo.getLeaveType()) .eq(bo.getApplicantDeptName() != null, "applicant_dept_name", bo.getApplicantDeptName()) .eq("del_flag", 0)