From 6728333b59973fabf1ebbeefa23e5c59e3b9595b Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 24 Apr 2025 13:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95=E5=91=A8?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/service/impl/ClassExamServiceImpl.java      | 2 +-
 src/main/java/com/peanut/modules/job/task/ClassToExamTask.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
index 7eaad9d3..9e24f28e 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
@@ -156,7 +156,7 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
             ClassEntity classEntity = classEntityDao.selectById(params.get("relationId").toString());
             ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
             if ("3".equals(classEntity.getState())&&
-                    DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()+classModel.getExamDays()).getTime()>new Date().getTime()){
+                    DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()+classModel.getExamDays()).getTime()<new Date().getTime()){
                 return R.error("考试周已结束，等待结班");
             }
             examTime = classModel.getExamTime();//考试持续时间
diff --git a/src/main/java/com/peanut/modules/job/task/ClassToExamTask.java b/src/main/java/com/peanut/modules/job/task/ClassToExamTask.java
index 139ebc58..2a36cd54 100644
--- a/src/main/java/com/peanut/modules/job/task/ClassToExamTask.java
+++ b/src/main/java/com/peanut/modules/job/task/ClassToExamTask.java
@@ -37,9 +37,8 @@ public class ClassToExamTask implements ITask{
                 .eq(ClassEntity::getState,1));
         for (ClassEntity classEntity : classEntities) {
             ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
-            int studyDays = classModel.getDays()-classModel.getExamDays();
             //考试周开始时间
-            Date startExamTime = DateUtils.addDateDays(classEntity.getStartTime(),studyDays);
+            Date startExamTime = DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays());
             if (startExamTime.getTime()<=new Date().getTime()){//已到考试周，调整小班状态为考试周
                 classEntity.setState("3");
                 classEntityDao.updateById(classEntity);