From ea3bcc24543202a55b22623cad8dd8900d550242 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 14:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index 4997be2..e80229d 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -117,7 +117,7 @@
throw new RuntimeException("鍙兘淇敼杩樻湭寮�濮嬬殑鑰冭瘯");
}
BeanUtils.copyProperties(form, entity);
- entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), null));
+ entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), new Date()));
// 濡傛灉淇敼鎴愬姛鍙戦�乵q娑堟伅
if (baseMapper.updateById(entity) > 0) {
this.sendMQ(entity, entity.getUpdateVersion());
@@ -214,6 +214,7 @@
item.setExamPaperId(null);
}
});
+ //
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -954,7 +955,7 @@
/**
* 浣滃簾
*
- * @param examId
+ * @param id
* @return {@link Result }
* @author
*/
@@ -977,13 +978,8 @@
Date currentTime = new Date();
Date startTime = examInfo.getStartTime();
Date endTime = examInfo.getEndTime();
- if (currentTime.before(startTime)) {
- examInfo.setStatus(ExamStatusEnum.NOT_START);
- } else if (currentTime.after(startTime) && currentTime.before(endTime)) {
- examInfo.setStatus(ExamStatusEnum.ING);
- } else {
- examInfo.setStatus(ExamStatusEnum.FINISHED);
- }
+ ExamStatusEnum statusByTime = ExamStatusEnum.getStatusByTime(startTime, endTime, currentTime);
+ examInfo.setStatus(statusByTime);
// 淇敼褰撳墠鐨勮�冭瘯鐘舵��
new LambdaUpdateChainWrapper<>(examMapper)
.eq(Exam::getId, id)
--
Gitblit v1.8.0