From 22f49b3542c69c933435df3378e1b9dbdddd8650 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 20 Jan 2024 17:20:58 +0800
Subject: [PATCH] 状态判断修改
---
src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 3 ++-
src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/utils/DateUtils.java | 20 +++++++++++++++++++-
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
index 370e2e8..801ddf4 100644
--- a/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/assessment/service/impl/AssessmentTaskServiceImpl.java
@@ -69,7 +69,7 @@
@Override
public boolean saveOrUpdate(AssessmentTaskEntity assessmentTask) {
- if (DateUtils.isToday(assessmentTask.getStartTime())) { //如果是今天 状态修改为进行中
+ if (DateUtils.isBeforeNow(assessmentTask.getStartTime())) { //如果是小于当前日期 修改状态
assessmentTask.setIsAssessmentOk(0);
}
return super.saveOrUpdate(assessmentTask);
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index d246a0d..d2ea221 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -181,7 +181,8 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+ // 如果是小于当前日期 修改状态
+ if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isBeforeNow(evaluateTask.getEvaluateCutoffTimeStart())) {
evaluateTask.setEvaluateState(1);
}
return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));
diff --git a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
index db44543..1847a1b 100644
--- a/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/evaluate/service/impl/EvaluateTaskServiceImpl.java
@@ -63,7 +63,7 @@
@Transactional
public Boolean saveTaskAndCategory(EvaluateTaskDTO dto) {
- if (DateUtils.isToday(dto.getCandidateCutoffTimeStart())) {//是否今天开始
+ if (DateUtils.isBeforeNow(dto.getCandidateCutoffTimeStart())) {// 如果是小于当前日期 修改状态
dto.setCandidateState(1);
}
@@ -83,7 +83,7 @@
@Transactional
public Boolean updateTaskAndCategory(EvaluateTaskDTO dto) {
- if (DateUtils.isToday(dto.getCandidateCutoffTimeStart())) {//是否今天开始
+ if (DateUtils.isBeforeNow(dto.getCandidateCutoffTimeStart())) {//如果是小于当前日期 修改状态
dto.setCandidateState(1);
}
diff --git a/src/main/java/org/springblade/modules/utils/DateUtils.java b/src/main/java/org/springblade/modules/utils/DateUtils.java
index 23e956c..ac940e0 100644
--- a/src/main/java/org/springblade/modules/utils/DateUtils.java
+++ b/src/main/java/org/springblade/modules/utils/DateUtils.java
@@ -3,6 +3,7 @@
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -22,8 +23,25 @@
*/
public static boolean isToday(Date date) {
// 将日期转换为LocalDate对象
- LocalDate dateToLocalDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDateTime dateToLocalDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
return dateToLocalDate.equals(LocalDate.now());
}
+ /**
+ * 判断日期是否小于当前日期
+ * @param date 判断的日期
+ * @return
+ */
+ public static boolean isBeforeNow(Date date) {
+ // 获取当前时间
+ LocalDateTime now = LocalDateTime.now();
+
+ // 将Date对象转换为LocalDateTime对象
+ LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+
+ // 返回是否小于当前时间
+ return dateTime.isBefore(now);
+
+ }
+
}
--
Gitblit v1.9.3