Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-25 a1a7bb5093d30397078ce42ef025cd07378d1e1c

 src/main/java/com/ruoyi/ScheduleTask.java

@@ -5,7 +5,7 @@
import com.ruoyi.project.system.mapper.SysNoticeMapper;
import com.ruoyi.safe.mapper.SafeTrainingMapper;
import com.ruoyi.safe.pojo.SafeTraining;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@@ -14,14 +14,13 @@
import java.util.List;

@Component
@RequiredArgsConstructor
//定时任务汇总
public class ScheduleTask {

    @Autowired
    private SafeTrainingMapper safeTrainingMapper;
    private final SafeTrainingMapper safeTrainingMapper;

    @Autowired
    private SysNoticeMapper noticeMapper;
    private final SysNoticeMapper noticeMapper;

    //定时任务(15分钟执行一次--判断培训计划数据,状态做变更)
    @Scheduled(cron = "0 0/15 * * * ?")