zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改考试周限制

Browse Source
This commit is contained in:
wuchunlei
2025-04-24 13:48:14 +08:00
parent 7b1a4026a2
commit 6728333b59
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java
View File

@@ -156,7 +156,7 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
ClassEntity classEntity = classEntityDao.selectById(params.get("relationId").toString()); ClassEntity classEntity = classEntityDao.selectById(params.get("relationId").toString());
ClassModel classModel = classModelDao.selectById(classEntity.getModelId()); ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
if ("3".equals(classEntity.getState())&& 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("考试周已结束，等待结班"); return R.error("考试周已结束，等待结班");
} }
examTime = classModel.getExamTime();//考试持续时间 examTime = classModel.getExamTime();//考试持续时间

3
src/main/java/com/peanut/modules/job/task/ClassToExamTask.java
View File

@@ -37,9 +37,8 @@ public class ClassToExamTask implements ITask{
.eq(ClassEntity::getState,1)); .eq(ClassEntity::getState,1));
for (ClassEntity classEntity : classEntities) { for (ClassEntity classEntity : classEntities) {
ClassModel classModel = classModelDao.selectById(classEntity.getModelId()); 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()){//已到考试周，调整小班状态为考试周 if (startExamTime.getTime()<=new Date().getTime()){//已到考试周，调整小班状态为考试周
classEntity.setState("3"); classEntity.setState("3");
classEntityDao.updateById(classEntity); classEntityDao.updateById(classEntity);