教学周数改为教学时长/7,不减去考试周了
This commit is contained in:
@@ -279,7 +279,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
if (classModel.getIsTask()==1){
|
||||
int taskCount = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
|
||||
.eq(ClassTask::getClassId,classEntity.getId()).eq(ClassTask::getType,"0"));
|
||||
double allWeek = Math.ceil((classModel.getDays()-classModel.getExamDays())/7.0)-2;
|
||||
double allWeek = Math.ceil((classModel.getDays())/7.0)-2;
|
||||
if (taskCount<allWeek){
|
||||
return R.error("请至少发布"+allWeek+"个任务。");
|
||||
}
|
||||
@@ -865,7 +865,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
}
|
||||
}
|
||||
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
|
||||
for (int i = 1; i <= Math.ceil(((classModel.getDays()-classModel.getExamDays())/7.0));i++){
|
||||
for (int i = 1; i <= Math.ceil(((classModel.getDays())/7.0));i++){
|
||||
ClassTask classTask = new ClassTask();
|
||||
classTask.setClassId(classEntity.getId());
|
||||
classTask.setUserId(ShiroUtils.getUId());
|
||||
|
||||
Reference in New Issue
Block a user