From 03d2d1afcbc7e7d56e09fc56a9eb22e4f340f760 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Thu, 12 Jun 2025 18:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=AD=BB=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=90=E7=9A=84=E8=8E=AB=E5=90=8D=E5=85=B6=E5=A6=99=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/oa/SysOaAttendanceMapper.xml   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
index d3318db..93fd925 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
@@ -317,8 +317,13 @@
         AND oas.del_flag = 0
         AND (
         <!-- 如果 calcTime 不为空，查询 calcTime 对应的出勤记录 -->
-        (#{calcTime} IS NOT NULL AND #{calcTime} >= oas.create_time)
-        <!-- 如果 calcTime 为空，查询整个 relationMonth -->
+        (#{calcTime} IS NOT NULL AND( -- 如果 calcTime 和 oas.create_time 为同月，查询当月的记录
+        (DATE_FORMAT(#{calcTime}, '%Y-%m') = DATE_FORMAT(oas.create_time, '%Y-%m')
+        AND oas.create_time BETWEEN DATE_FORMAT(#{relationMonth}, '%Y-%m-01') AND #{calcTime})
+        -- 如果 calcTime 和 oas.create_time 不为同月，查询整个 relationMonth 的记录
+        OR DATE_FORMAT(#{calcTime}, '%Y-%m') != DATE_FORMAT(oas.create_time, '%Y-%m')
+        AND oas.create_time BETWEEN DATE_FORMAT(#{relationMonth}, '%Y-%m-01')
+        AND LAST_DAY(STR_TO_DATE(#{relationMonth}, '%Y-%m-01'))))
         OR (
         #{calcTime} IS NULL AND (
         -- 如果 relationMonth 是当前月，则查询本月最晚的记录