feat(oa): 修改考勤记录查询为区间查询
- 将开始时间和结束时间的查询条件从精确匹配修改为区间查询 - 增加大于等于开始时间、小于等于结束时间的查询条件 - 优化了考勤记录的查询逻辑,提高了查询的灵活性和准确性
This commit is contained in:
@@ -57,8 +57,13 @@ public class GearAttendanceRecordServiceImpl implements IGearAttendanceRecordSer
|
|||||||
lqw.eq(StringUtils.isNotBlank(bo.getUserId()), "ar.user_id", bo.getUserId());
|
lqw.eq(StringUtils.isNotBlank(bo.getUserId()), "ar.user_id", bo.getUserId());
|
||||||
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
|
lqw.eq(bo.getRecordDate() != null, "ar.record_date", bo.getRecordDate());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getRecordType()), "ar.record_type", bo.getRecordType());
|
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(bo.getDurationHour() != null, "ar.duration_hour", bo.getDurationHour());
|
||||||
//逻辑删除
|
//逻辑删除
|
||||||
lqw.eq("ar.del_flag", "0");
|
lqw.eq("ar.del_flag", "0");
|
||||||
|
|||||||
Reference in New Issue
Block a user