gaoluyang
2026-11-02 344a18cc69dd2f728734e940421b717cacb85563
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给下一个月排班
     * 给每个人都进行排班(默认早班)
     */