From 1d23adb2fa62ab836aca1a6d47f8a5ab5b12938f Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期四, 17 十月 2024 15:35:11 +0800
Subject: [PATCH] 优化考试时间创建和修改会向后推8小时的问题
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 5 -----
src/main/java/com/ycl/jxkg/domain/form/ExamForm.java | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java b/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java
index e556192..5df4323 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamForm.java
@@ -46,12 +46,12 @@
@NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
@NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "UTC")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
public static Exam getEntityByForm(@NonNull ExamForm form, Exam entity) {
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 becc1df..e80229d 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -91,8 +91,6 @@
@Override
public Result add(ExamForm form) {
Exam entity = ExamForm.getEntityByForm(form, null);
- form.getStartTime().setTime(form.getStartTime().getTime() - 8 * 60 * 60 * 1000);
- form.getEndTime().setTime(form.getEndTime().getTime() - 8 * 60 * 60 * 1000);
entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), null));
entity.setTeacherId(webContext.getCurrentUser().getId());
// 璁剧疆涔愯閿佺増鏈�
@@ -118,9 +116,6 @@
if (!ExamStatusEnum.NOT_START.equals(entity.getStatus())) {
throw new RuntimeException("鍙兘淇敼杩樻湭寮�濮嬬殑鑰冭瘯");
}
- // 灏嗗紑濮嬭�冭瘯鏃堕棿鎯冲墠鎺�8灏忔椂
- form.getStartTime().setTime(form.getStartTime().getTime() - 8 * 60 * 60 * 1000);
- form.getEndTime().setTime(form.getEndTime().getTime() - 8 * 60 * 60 * 1000);
BeanUtils.copyProperties(form, entity);
entity.setStatus(ExamStatusEnum.getStatusByTime(form.getStartTime(), form.getEndTime(), new Date()));
// 濡傛灉淇敼鎴愬姛鍙戦�乵q娑堟伅
--
Gitblit v1.8.0