diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java index 633f390..2c736d8 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearAttendanceRecordServiceImpl.java @@ -57,8 +57,13 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer lqw.eq(StringUtils.isNotBlank(bo.getUserId()), "ar.user_id", bo.getUserId()); lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate()); lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), "ar.record_type", bo.getRecordType()); - lqw.eq(bo.getStartTime() != null, "ar.start_time", bo.getStartTime()); - lqw.eq(bo.getEndTime() != null, "ar.end_time", bo.getEndTime()); + // 修改开始时间和结束时间为区间查询 + if (bo.getStartTime() != null) { + lqw.ge("ar.start_time", bo.getStartTime()); // 大于等于开始时间 + } + if (bo.getEndTime() != null) { + lqw.le("ar.end_time", bo.getEndTime()); // 小于等于结束时间 + } lqw.eq(bo.getDurationHour() != null, "ar.duration_hour", bo.getDurationHour()); //逻辑删除 lqw.eq("ar.del_flag", "0");