From 344a18cc69dd2f728734e940421b717cacb85563 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 22:33:38 +0800
Subject: [PATCH] fix(staff): 排班管理合计出勤改为按打卡记录统计

---
 src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
index a791300..0111806 100644
--- a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
+++ b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
@@ -2,22 +2,22 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.approve.mapper.HolidaySettingsMapper;
+import com.ruoyi.approve.pojo.HolidaySettings;
 import com.ruoyi.staff.dto.PerformanceShiftAddDto;
 import com.ruoyi.staff.mapper.PersonalAttendanceLocationConfigMapper;
-import com.ruoyi.staff.mapper.PersonalShiftMapper;
+import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
 import com.ruoyi.staff.mapper.StaffOnJobMapper;
 import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
 import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
 import com.ruoyi.staff.pojo.StaffOnJob;
 import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
-import com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper;
 import com.ruoyi.staff.service.PersonalShiftService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -26,7 +26,6 @@
 import java.time.temporal.WeekFields;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -37,22 +36,15 @@
  */
 @Slf4j
 @Component
+@RequiredArgsConstructor
 public class PersonalAttendanceRecordsTask {
 
-    @Autowired
-    private PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
-
-    @Autowired
-    private PersonalAttendanceRecordsService personalAttendanceRecordsService;
-
-    @Autowired
-    private PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
-
-    @Autowired
-    private StaffOnJobMapper staffOnJobMapper;
-
-    @Autowired
-    private PersonalShiftService personalShiftService;
+    private final PersonalAttendanceRecordsMapper personalAttendanceRecordsMapper;
+    private final PersonalAttendanceRecordsService personalAttendanceRecordsService;
+    private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;
+    private final StaffOnJobMapper staffOnJobMapper;
+    private final PersonalShiftService personalShiftService;
+    private final HolidaySettingsMapper holidaySettingsMapper;
 
     /**
      * 姣忓ぉ鍑屾櫒鐢熸垚鏄ㄦ棩鐨勭己鍕よ褰�
@@ -64,6 +56,12 @@
         try {
             // 鑾峰彇鏄ㄦ棩鏃ユ湡
             LocalDate yesterday = LocalDate.now().minusDays(1);
+
+            // 鍛ㄦ湯銆佹硶瀹氳妭鍋囨棩鏄紤鎭棩锛屼笉鐢熸垚缂哄嫟璁板綍
+            if (!isWorkingDay(yesterday)) {
+                log.info("鏄ㄦ棩{}涓哄懆鏈垨娉曞畾鑺傚亣鏃ワ紝璺宠繃缂哄嫟璁板綍鐢熸垚", yesterday);
+                return;
+            }
 
             // 鐩存帴鏌ヨ鏄ㄥぉ娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑锛�
             LocalDateTime todayStart = LocalDate.now().atStartOfDay();
@@ -99,6 +97,23 @@
     }
 
     /**
+     * 鍒ゆ柇鏌愬ぉ鏄惁涓哄伐浣滄棩銆�
+     * 鍋囨湡璁剧疆閲屸�滆皟浼戜笂鐝��(adjustment) 绠楀伐浣滄棩锛涘叾浠栧亣鏈燂紙娉曞畾鑺傚亣鏃ョ瓑锛夌畻浼戞伅鏃ワ紱
+     * 娌℃湁閰嶇疆鍋囨湡鐨勬棩鏈熸寜鑷劧鍛ㄥ垽鏂紝鍛ㄥ叚銆佸懆鏃ヤ紤鎭��
+     */
+    private boolean isWorkingDay(LocalDate date) {
+        List<HolidaySettings> holidays = holidaySettingsMapper.selectList(
+                Wrappers.<HolidaySettings>lambdaQuery()
+                        .eq(HolidaySettings::getStatus, "active")
+                        .le(HolidaySettings::getStartDate, date)
+                        .ge(HolidaySettings::getEndDate, date));
+        if (CollectionUtil.isNotEmpty(holidays)) {
+            return holidays.stream().anyMatch(h -> "adjustment".equals(h.getType()));
+        }
+        return date.getDayOfWeek().getValue() < 6;
+    }
+
+    /**
      * 瀹氭椂浠诲姟,姣忎釜鏈�1鍙风殑00:00:00缁欎笅涓�涓湀鎺掔彮
      * 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
      */

--
Gitblit v1.9.3