From cecd7580b5e629173bdb5b258f2676d16d580f72 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 七月 2026 15:49:55 +0800
Subject: [PATCH] fix: 安全培训考核签到修改
---
src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
index ee9c814..0dd877f 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -51,6 +51,7 @@
@Override
public IPage<SafeTrainingDto> pageSafeTraining(Page page, SafeTrainingDto safeTrainingDto) {
+ safeTrainingMapper.refreshTrainingState();
return safeTrainingMapper.pageSafeTraining(page, safeTrainingDto);
}
@@ -84,10 +85,11 @@
String trainingDate = safeTraining.getTrainingDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
LocalDateTime openingTime = LocalDateTime.parse((trainingDate + safeTraining.getOpeningTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
LocalDateTime endTime = LocalDateTime.parse((trainingDate + safeTraining.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-ddHH:mm:ss"));
- if (LocalDateTime.now().isBefore(openingTime)) {
+ LocalDateTime now = LocalDateTime.now();
+ if (now.isBefore(openingTime)) {
//鏈紑濮�
safeTraining.setState(0);
- } else if (LocalDateTime.now().isAfter(endTime)) {
+ } else if (!now.isBefore(endTime)) {
//宸茬粨鏉�
safeTraining.setState(2);
} else {
@@ -101,6 +103,7 @@
@Override
public SafeTrainingDto getSafeTraining(Long id) {
+ safeTrainingMapper.refreshTrainingState();
//涓昏〃鏁版嵁
SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
//闄勪欢
--
Gitblit v1.9.3