From 1f31240c4ceb239c66cff0a4746631d4d7805dc6 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 7 Aug 2025 11:05:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E4=BF=AE=E6=94=B9=E8=80=83?=
 =?UTF-8?q?=E5=8B=A4=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E4=B8=BA=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将开始时间和结束时间的查询条件从精确匹配修改为区间查询
- 增加大于等于开始时间、小于等于结束时间的查询条件
- 优化了考勤记录的查询逻辑，提高了查询的灵活性和准确性
---
 .../oa/service/impl/GearAttendanceRecordServiceImpl.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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");