小班结班,修改结班限制时间、任务评分员限制<2
This commit is contained in:
@@ -1418,7 +1418,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
public R closeClass(Map<String, Object> params) {
|
public R closeClass(Map<String, Object> params) {
|
||||||
ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString());
|
ClassEntity classEntity = this.getBaseMapper().selectById(params.get("classId").toString());
|
||||||
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
|
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
|
||||||
if (DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()).getTime() < new Date().getTime()){
|
if (DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()).getTime() > new Date().getTime()){
|
||||||
return R.error("教学时间未完");
|
return R.error("教学时间未完");
|
||||||
}
|
}
|
||||||
//结班限制
|
//结班限制
|
||||||
@@ -1431,7 +1431,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
int taskReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
int taskReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
||||||
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
|
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
|
||||||
.eq(ClassTaskAndQuesReply::getType,0)
|
.eq(ClassTaskAndQuesReply::getType,0)
|
||||||
.ne(ClassTaskAndQuesReply::getScoreSuccess,2));
|
.lt(ClassTaskAndQuesReply::getScoreSuccess,2));
|
||||||
int questionReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
int questionReplys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
||||||
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
|
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
|
||||||
.eq(ClassTaskAndQuesReply::getType,1)
|
.eq(ClassTaskAndQuesReply::getType,1)
|
||||||
|
|||||||
Reference in New Issue
Block a user