|
|
@@ -84,6 +84,9 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
|
|
|
if(ObjectUtil.isNotEmpty(tExamPageParam.getPaperId())) {
|
|
|
queryWrapper.lambda().eq(TExam::getPaperId, tExamPageParam.getPaperId());
|
|
|
}
|
|
|
+ if(ObjectUtil.isNotEmpty(tExamPageParam.getExamType())) {
|
|
|
+ queryWrapper.lambda().eq(TExam::getExamType, tExamPageParam.getExamType());
|
|
|
+ }
|
|
|
if(ObjectUtil.isNotEmpty(tExamPageParam.getUserId())){
|
|
|
queryWrapper.lambda().like(TExam::getStudentIds, tExamPageParam.getUserId());
|
|
|
}
|
|
|
@@ -107,6 +110,13 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
|
|
|
}
|
|
|
TExam tExam = BeanUtil.toBean(tExamAddParam, TExam.class);
|
|
|
tExam.setStudentIds("1935565895337304066");
|
|
|
+ if(tExam.getExamType() == null){
|
|
|
+ if(examPaper.getPaperType() == ExamPaperTypeEnum.Survey.getCode()){
|
|
|
+ tExam.setExamType("3"); // 调查问卷
|
|
|
+ }else{
|
|
|
+ tExam.setExamType("1"); // 普通考试
|
|
|
+ }
|
|
|
+ }
|
|
|
this.save(tExam);
|
|
|
if(tExamAddParam.getChapterId() != null && !tExamAddParam.getChapterId().isEmpty()){
|
|
|
CourseChapterPaper cp = new CourseChapterPaper();
|