管理端小班考试周时间提示
This commit is contained in:
@@ -49,6 +49,10 @@ public class ClassEntity {
|
|||||||
private ClassModel classModel;
|
private ClassModel classModel;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<Map<String,Object>> classUsers;
|
private List<Map<String,Object>> classUsers;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Date examStartTime;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Date examEndTime;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,5 +27,7 @@ public class UserCertificateLabel {
|
|||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<UserCertificateLabel> children;
|
private List<UserCertificateLabel> children;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private List<UserCertificate> userCertificates;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -215,7 +215,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
}else {
|
}else {
|
||||||
classEntity.setCreateUser(user);
|
classEntity.setCreateUser(user);
|
||||||
}
|
}
|
||||||
classEntity.setClassModel(classModelDao.selectById(classEntity.getModelId()));
|
ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
|
||||||
|
classEntity.setClassModel(classModel);
|
||||||
|
classEntity.setExamStartTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()));
|
||||||
|
classEntity.setExamEndTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()+classModel.getExamDays()));
|
||||||
MPJLambdaWrapper<ClassUser> userWrapper = new MPJLambdaWrapper<>();
|
MPJLambdaWrapper<ClassUser> userWrapper = new MPJLambdaWrapper<>();
|
||||||
userWrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,ClassUser::getUserId);
|
userWrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,ClassUser::getUserId);
|
||||||
userWrapper.select("t.role,t.user_id as userId,t1.tel,t1.name,t1.nickname");
|
userWrapper.select("t.role,t.user_id as userId,t1.tel,t1.name,t1.nickname");
|
||||||
|
|||||||
Reference in New Issue
Block a user